X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fpath.c;h=3775577bcf87031b27682f265536b858d040f8b6;hb=4beaf24f416e33840a974c18c34b56084d2b978a;hp=3936971b41a63c5325fbe7ec62da05e15144d164;hpb=67445f4e22ad924394acdd4fd49e6f238244a5ca;p=elogind.git

diff --git a/src/core/path.c b/src/core/path.c
index 3936971b4..3775577bc 100644
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -124,7 +124,7 @@ int path_spec_fd_event(PathSpec *s, uint32_t events) {
         int r = 0;
 
         if (events != EPOLLIN) {
-                log_error("Got Invalid poll event on inotify.");
+                log_error("Got invalid poll event on inotify.");
                 r = -EINVAL;
                 goto out;
         }
@@ -137,13 +137,15 @@ int path_spec_fd_event(PathSpec *s, uint32_t events) {
 
         assert(l > 0);
 
-        if (!(buf = malloc(l))) {
+        buf = malloc(l);
+        if (!buf) {
                 log_error("Failed to allocate buffer: %m");
                 r = -errno;
                 goto out;
         }
 
-        if ((k = read(s->inotify_fd, buf, l)) < 0) {
+        k = read(s->inotify_fd, buf, l);
+        if (k < 0) {
                 log_error("Failed to read inotify event: %m");
                 r = -errno;
                 goto out;
@@ -217,7 +219,8 @@ static void path_spec_mkdir(PathSpec *s, mode_t mode) {
         if (s->type == PATH_EXISTS || s->type == PATH_EXISTS_GLOB)
                 return;
 
-        if ((r = mkdir_p_label(s->path, mode)) < 0)
+        r = mkdir_p_label(s->path, mode);
+        if (r < 0)
                 log_warning("mkdir(%s) failed: %s", s->path, strerror(-r));
 }
 
@@ -245,22 +248,28 @@ static void path_init(Unit *u) {
         p->directory_mode = 0755;
 }
 
-static void path_done(Unit *u) {
-        Path *p = PATH(u);
+void path_free_specs(Path *p) {
         PathSpec *s;
 
         assert(p);
 
-        unit_ref_unset(&p->unit);
-
         while ((s = p->specs)) {
-                path_spec_unwatch(s, u);
+                path_spec_unwatch(s, UNIT(p));
                 LIST_REMOVE(PathSpec, spec, p->specs, s);
                 path_spec_done(s);
                 free(s);
         }
 }
 
+static void path_done(Unit *u) {
+        Path *p = PATH(u);
+
+        assert(p);
+
+        unit_ref_unset(&p->unit);
+        path_free_specs(p);
+}
+
 int path_add_one_mount_link(Path *p, Mount *m) {
         PathSpec *s;
         int r;
@@ -304,7 +313,8 @@ static int path_verify(Path *p) {
                 return 0;
 
         if (!p->specs) {
-                log_error("%s lacks path setting. Refusing.", UNIT(p)->id);
+                log_error_unit(UNIT(p)->id,
+                               "%s lacks path setting. Refusing.", UNIT(p)->id);
                 return -EINVAL;
         }