X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fcondition.c;h=0a77607eeaa1e5244d4bf6964ae97cdfbdb1630e;hb=a6dcc7e5924f9c27d3e9c6560a448b02ec28b65f;hp=3a3452959dd726010dc4ab91f9afede58fd57d43;hpb=447021aafdf4bd0c0f70a3078d35a8f00ada4504;p=elogind.git

diff --git a/src/shared/condition.c b/src/shared/condition.c
index 3a3452959..0a77607ee 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -23,15 +23,12 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/statvfs.h>
 #include <fnmatch.h>
 
 #include "sd-id128.h"
 #include "util.h"
 #include "virt.h"
 #include "path-util.h"
-#include "fileio.h"
-#include "unit.h"
 #include "architecture.h"
 #include "smack-util.h"
 #include "apparmor-util.h"
@@ -47,7 +44,7 @@ Condition* condition_new(ConditionType type, const char *parameter, bool trigger
 
         assert(type >= 0);
         assert(type < _CONDITION_TYPE_MAX);
-        assert(!parameter == (type == CONDITION_NULL));
+        assert((!parameter) == (type == CONDITION_NULL));
 
         c = new0(Condition, 1);
         if (!c)
@@ -289,7 +286,7 @@ static int condition_test_needs_update(Condition *c) {
         if (!path_is_absolute(c->parameter))
                 return true;
 
-        p = strappenda(c->parameter, "/.updated");
+        p = strjoina(c->parameter, "/.updated");
         if (lstat(p, &other) < 0)
                 return true;