From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 5 Jan 2013 01:46:49 +0000 (-0500)
Subject: core/path: modernize style
X-Git-Tag: v197~30
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=15f55e8092159cec010fc80b676bc2e0de3ecbdf

core/path: modernize style
---

diff --git a/src/core/path.c b/src/core/path.c
index 3936971b4..d65339771 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));
 }