From 2e9602716c4586ccb1b54eda4718f4dd53399f99 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Mon, 3 Mar 2014 18:29:09 -0500 Subject: simplify check for leading "local/" Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- src/pacman/remove.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 00bd3b3b..933e6f72 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -94,13 +94,10 @@ int pacman_remove(alpm_list_t *targets) /* Step 1: add targets to the created transaction */ for(i = targets; i; i = alpm_list_next(i)) { char *target = i->data; - char *targ = strchr(target, '/'); - if(targ && strncmp(target, "local", 5) == 0) { - targ++; - } else { - targ = target; + if(strncmp(target, "local/", 6) == 0) { + target += 6; } - if(remove_target(targ) == -1) { + if(remove_target(target) == -1) { retval = 1; } } -- cgit v1.2.3-24-g4f1b