From 968dfbb8b376de2dc6f2441dc3966d1416ad0046 Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Thu, 16 Apr 2009 16:32:04 +0300 Subject: pkg: apk_deps_del helper introduced --- src/del.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/del.c') diff --git a/src/del.c b/src/del.c index 00938b7..deafeff 100644 --- a/src/del.c +++ b/src/del.c @@ -19,7 +19,7 @@ static int del_main(void *ctx, int argc, char **argv) struct apk_database db; struct apk_state *state; struct apk_name *name; - int i, j, r; + int i, r; if (apk_db_open(&db, apk_root, APK_OPENF_WRITE) < 0) return -1; @@ -29,18 +29,8 @@ static int del_main(void *ctx, int argc, char **argv) for (i = 0; i < argc; i++) { name = apk_db_get_name(&db, APK_BLOB_STR(argv[i])); - - /* Remove from world, so we get proper changeset */ name->flags &= ~APK_NAME_TOPLEVEL; - for (j = 0; j < db.world->num; j++) { - if (strcmp(db.world->item[j].name->name, - argv[i]) == 0) { - db.world->item[j] = - db.world->item[db.world->num-1]; - db.world = - apk_dependency_array_resize(db.world, db.world->num-1); - } - } + apk_deps_del(&db.world, name); } state = apk_state_new(&db); -- cgit v1.2.3