From: Thomas Hindoe Paaboel Andersen Date: Fri, 16 May 2014 21:37:54 +0000 (+0200) Subject: systemctl: more cleanup X-Git-Tag: v213~110 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4723e4b2a4ca7a7df449ab2377770301cce6abf7 systemctl: more cleanup This is followup on 05cae7f3431446236139434ee58a6275f3cb31e8 I think the intention was to use the newly introduced 'path' variable in the inner loop instead of p. --- diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 2fa8ecc66..6e98c0515 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5030,16 +5030,16 @@ static int enable_sysv_units(const char *verb, char **args) { _cleanup_free_ char *path = NULL; if (!isempty(arg_root)) - asprintf(&p, "%s/%s/%s", arg_root, *k, name); + asprintf(&path, "%s/%s/%s", arg_root, *k, name); else - asprintf(&p, "%s/%s", *k, name); + asprintf(&path, "%s/%s", *k, name); - if (!p) { + if (!path) { r = log_oom(); goto finish; } - found_native = access(p, F_OK) >= 0; + found_native = access(path, F_OK) >= 0; if (found_native) break; }