From dc92e62c6c34f242aa54aa187e50a94ed7695c51 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 13 Jun 2014 12:39:58 +0200
Subject: condition: minor modernizations

---
 src/shared/condition-util.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/condition-util.c b/src/shared/condition-util.c
index 9961cb47f0..1c7d1f6a5e 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) {
-- 
cgit v1.2.3-54-g00ecf