X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fcondition-util.c;fp=src%2Fshared%2Fcondition-util.c;h=1c7d1f6a5e4b2e137dc9505119146250a14b90ed;hb=dc92e62c6c34f242aa54aa187e50a94ed7695c51;hp=9961cb47f05a89ecb73866868ec1f6e79b329c9e;hpb=d4c049bfcde7bd8ff8baaee4ff8aa3bd16d7be54;p=elogind.git diff --git a/src/shared/condition-util.c b/src/shared/condition-util.c index 9961cb47f..1c7d1f6a5 100644 --- a/src/shared/condition-util.c +++ b/src/shared/condition-util.c @@ -177,10 +177,9 @@ bool condition_test_architecture(Condition *c) { } bool condition_test_host(Condition *c) { + _cleanup_free_ char *h = NULL; sd_id128_t x, y; - char *h; int r; - bool b; assert(c); assert(c->parameter); @@ -199,10 +198,7 @@ bool condition_test_host(Condition *c) { if (!h) return c->negate; - b = fnmatch(c->parameter, h, FNM_CASEFOLD) == 0; - free(h); - - return b == !c->negate; + return (fnmatch(c->parameter, h, FNM_CASEFOLD) == 0) == !c->negate; } bool condition_test_ac_power(Condition *c) {