X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus1-generator%2Fdbus1-generator.c;h=21e9e9ca73daf0abbb8d5a6b1370853b3df2200a;hp=5d3b1a856afa8281b1066d427b7348c1f9e46ab6;hb=23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41;hpb=5e03c6e3b517286bbd65b48d88f60e5b83721894

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index 5d3b1a856..21e9e9ca7 100644
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -102,10 +102,8 @@ static int create_dbus_files(
                 }
 
                 r = fflush_and_check(f);
-                if (r < 0) {
-                        log_error_errno(r, "Failed to write %s: %m", a);
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to write %s: %m", a);
 
                 fclose(f);
                 f = NULL;
@@ -139,10 +137,8 @@ static int create_dbus_files(
                 service);
 
         r = fflush_and_check(f);
-        if (r < 0) {
-                log_error_errno(r, "Failed to write %s: %m", b);
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to write %s: %m", b);
 
         lnk = strjoin(arg_dest_late, "/" SPECIAL_BUSNAMES_TARGET ".wants/", name, ".busname", NULL);
         if (!lnk)
@@ -331,10 +327,8 @@ int main(int argc, char *argv[]) {
                 path = "/usr/share/dbus-1/system-services";
                 type = "system";
                 units = SYSTEM_DATA_UNIT_PATH;
-        } else {
-                log_error_errno(r, "Failed to determine whether we are running as user or system instance: %m");
-                return r;
-        }
+        } else
+                return log_error_errno(r, "Failed to determine whether we are running as user or system instance: %m");
 
         r = parse_dbus_fragments(path, type);