X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fcondition.c;h=da7560f05fb616f2176f7c2a389bb61b8a2591e1;hb=3175fcdec5d748e8db85a3e7fe1cb67f5f6a865d;hp=dcbf9a7e86a52f2ef089339550b6da4f02eba41f;hpb=2822da4fb7f891e5320f02f1d00f64b72221ced4;p=elogind.git

diff --git a/src/shared/condition.c b/src/shared/condition.c
index dcbf9a7e8..da7560f05 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -31,7 +31,6 @@
 #include "virt.h"
 #include "path-util.h"
 #include "fileio.h"
-#include "unit.h"
 #include "architecture.h"
 #include "smack-util.h"
 #include "apparmor-util.h"
@@ -73,11 +72,13 @@ void condition_free(Condition *c) {
         free(c);
 }
 
-void condition_free_list(Condition *first) {
+Condition* condition_free_list(Condition *first) {
         Condition *c, *n;
 
         LIST_FOREACH_SAFE(conditions, c, n, first)
                 condition_free(c);
+
+        return NULL;
 }
 
 static int condition_test_kernel_command_line(Condition *c) {
@@ -287,7 +288,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;