rules: simplify mmc RPMB handling

[elogind.git] / src / dbus1-generator / dbus1-generator.c

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index 4ba1ad131d2d4d53c440096805958c388a60016c..2e08af2df292e5037caeb81046da3cf2f74ee144 100644 (file)
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -58,10 +58,8 @@ static int create_dbus_files(
                         return log_oom();
 
                 f = fopen(a, "wxe");
-                if (!f) {
-                        log_error("Failed to create %s: %m", a);
-                        return -errno;
-                }
+                if (!f)
+                        return log_error_errno(errno, "Failed to create %s: %m", a);
 
                 fprintf(f,
                         "# Automatically generated by systemd-dbus1-generator\n\n"
@@ -86,7 +84,7 @@ static int create_dbus_files(
                         fprintf(f, "Environment=DBUS_STARTER_BUS_TYPE=%s\n", type);
 
                         if (streq(type, "system"))
-                                fprintf(f, "Environment=DBUS_STARTER_ADDRESS=" DEFAULT_SYSTEM_BUS_PATH "\n");
+                                fprintf(f, "Environment=DBUS_STARTER_ADDRESS=" DEFAULT_SYSTEM_BUS_ADDRESS "\n");
                         else if (streq(type, "session")) {
                                 char *run;
 
@@ -96,16 +94,14 @@ static int create_dbus_files(
                                         return -EINVAL;
                                 }
 
-                                fprintf(f, "Environment=DBUS_STARTER_ADDRESS="KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT "\n",
+                                fprintf(f, "Environment=DBUS_STARTER_ADDRESS="KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT "\n",
                                         getuid(), run);
                         }
                 }
 
                 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;
@@ -118,10 +114,8 @@ static int create_dbus_files(
                 return log_oom();
 
         f = fopen(b, "wxe");
-        if (!f) {
-                log_error("Failed to create %s: %m", b);
-                return -errno;
-        }
+        if (!f)
+                return log_error_errno(errno, "Failed to create %s: %m", b);
 
         fprintf(f,
                 "# Automatically generated by systemd-dbus1-generator\n\n"
@@ -139,20 +133,16 @@ 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)
                 return log_oom();
 
         mkdir_parents_label(lnk, 0755);
-        if (symlink(b, lnk)) {
-                log_error("Failed to create symlink %s: %m", lnk);
-                return -errno;
-        }
+        if (symlink(b, lnk))
+                return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
 
         return 0;
 }
@@ -165,6 +155,7 @@ static int add_dbus(const char *path, const char *fname, const char *type) {
                 { "D-BUS Service", "Exec", config_parse_string, 0, &exec },
                 { "D-BUS Service", "User", config_parse_string, 0, &user },
                 { "D-BUS Service", "SystemdService", config_parse_string, 0, &service },
+                { },
         };
 
         char *p;
@@ -173,7 +164,7 @@ static int add_dbus(const char *path, const char *fname, const char *type) {
         assert(path);
         assert(fname);
 
-        p = strappenda(path, "/", fname);
+        p = strjoina(path, "/", fname);
         r = config_parse(NULL, p, NULL,
                          "D-BUS Service\0",
                          config_item_table_lookup, table,
@@ -233,7 +224,7 @@ static int parse_dbus_fragments(const char *path, const char *type) {
                 if (errno == -ENOENT)
                         return 0;
 
-                log_error("Failed to enumerate D-Bus activated services: %m");
+                log_error_errno(errno, "Failed to enumerate D-Bus activated services: %m");
                 return -errno;
         }
 
@@ -252,21 +243,19 @@ static int parse_dbus_fragments(const char *path, const char *type) {
         return r;
 
 fail:
-        log_error("Failed to read D-Bus services directory: %m");
+        log_error_errno(errno, "Failed to read D-Bus services directory: %m");
         return -errno;
 }
 
 static int link_busnames_target(const char *units) {
         const char *f, *t;
 
-        f = strappenda(units, "/" SPECIAL_BUSNAMES_TARGET);
-        t = strappenda(arg_dest, "/" SPECIAL_BASIC_TARGET ".wants/" SPECIAL_BUSNAMES_TARGET);
+        f = strjoina(units, "/" SPECIAL_BUSNAMES_TARGET);
+        t = strjoina(arg_dest, "/" SPECIAL_BASIC_TARGET ".wants/" SPECIAL_BUSNAMES_TARGET);
 
         mkdir_parents_label(t, 0755);
-        if (symlink(f, t) < 0) {
-                log_error("Failed to create symlink %s: %m", t);
-                return -errno;
-        }
+        if (symlink(f, t) < 0)
+                return log_error_errno(errno, "Failed to create symlink %s: %m", t);
 
         return 0;
 }
@@ -274,27 +263,21 @@ static int link_busnames_target(const char *units) {
 static int link_compatibility(const char *units) {
         const char *f, *t;
 
-        f = strappenda(units, "/systemd-bus-proxyd.socket");
-        t = strappenda(arg_dest, "/" SPECIAL_DBUS_SOCKET);
+        f = strjoina(units, "/systemd-bus-proxyd.socket");
+        t = strjoina(arg_dest, "/" SPECIAL_DBUS_SOCKET);
         mkdir_parents_label(t, 0755);
-        if (symlink(f, t) < 0) {
-                log_error("Failed to create symlink %s: %m", t);
-                return -errno;
-        }
+        if (symlink(f, t) < 0)
+                return log_error_errno(errno, "Failed to create symlink %s: %m", t);
 
-        f = strappenda(units, "/systemd-bus-proxyd.socket");
-        t = strappenda(arg_dest, "/" SPECIAL_SOCKETS_TARGET ".wants/systemd-bus-proxyd.socket");
+        f = strjoina(units, "/systemd-bus-proxyd.socket");
+        t = strjoina(arg_dest, "/" SPECIAL_SOCKETS_TARGET ".wants/systemd-bus-proxyd.socket");
         mkdir_parents_label(t, 0755);
-        if (symlink(f, t) < 0) {
-                log_error("Failed to create symlink %s: %m", t);
-                return -errno;
-        }
+        if (symlink(f, t) < 0)
+                return log_error_errno(errno, "Failed to create symlink %s: %m", t);
 
-        t = strappenda(arg_dest, "/" SPECIAL_DBUS_SERVICE);
-        if (symlink("/dev/null", t) < 0) {
-                log_error("Failed to mask %s: %m", t);
-                return -errno;
-        }
+        t = strjoina(arg_dest, "/" SPECIAL_DBUS_SERVICE);
+        if (symlink("/dev/null", t) < 0)
+                return log_error_errno(errno, "Failed to mask %s: %m", t);
 
         return 0;
 }
@@ -331,10 +314,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);