systemctl: no need to fdopen stdout

[elogind.git] / src / systemctl / systemctl.c

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index f7b2fb40190e61bc0ee73c3f36723e2d463a1450..d5d6b9f7d5990257cb65666f3e9be5a4d260ad87 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1152,7 +1152,7 @@ static int list_dependencies_print(const char *name, int level, unsigned int bra
 
                 for (i = level - 1; i >= 0; i--) {
                         len += 2;
-                        if(len > max_len - 3 && !arg_full) {
+                        if (len > max_len - 3 && !arg_full) {
                                 printf("%s...\n",max_len % 2 ? "" : " ");
                                 return 0;
                         }
@@ -1160,7 +1160,7 @@ static int list_dependencies_print(const char *name, int level, unsigned int bra
                 }
                 len += 2;
 
-                if(len > max_len - 3 && !arg_full) {
+                if (len > max_len - 3 && !arg_full) {
                         printf("%s...\n",max_len % 2 ? "" : " ");
                         return 0;
                 }
@@ -1174,7 +1174,7 @@ static int list_dependencies_print(const char *name, int level, unsigned int bra
         }
 
         n = ellipsize(name, max_len-len, 100);
-        if(!n)
+        if (!n)
                 return log_oom();
 
         printf("%s\n", n);
@@ -1334,7 +1334,7 @@ static int list_dependencies_one(
 
                 if (arg_all || unit_name_to_type(*c) == UNIT_TARGET) {
                        r = list_dependencies_one(bus, *c, level + 1, &u, (branches << 1) | (c[1] == NULL ? 0 : 1));
-                       if(r < 0)
+                       if (r < 0)
                                return r;
                 }
         }
@@ -1814,7 +1814,7 @@ static int wait_for_jobs(sd_bus *bus, Set *s) {
                 return log_oom();
 
         while (!set_isempty(s)) {
-                for(;;) {
+                for (;;) {
                         r = sd_bus_process(bus, NULL);
                         if (r < 0)
                                 return r;
@@ -3690,7 +3690,6 @@ static int cat(sd_bus *bus, char **args) {
                 _cleanup_free_ char *fragment_path = NULL;
                 _cleanup_strv_free_ char **dropin_paths = NULL;
                 sd_bus_error error;
-                FILE *stdout;
                 char **path;
 
                 n = unit_name_mangle(*name);
@@ -3718,23 +3717,6 @@ static int cat(sd_bus *bus, char **args) {
                         continue;
                 }
 
-                if (isempty(fragment_path)) {
-                        free(fragment_path);
-                        fragment_path = NULL;
-
-                        if (sd_bus_get_property_string(
-                                        bus,
-                                        "org.freedesktop.systemd1",
-                                        unit,
-                                        "org.freedesktop.systemd1.Unit",
-                                        "SourcePath",
-                                        &error,
-                                        &fragment_path) < 0) {
-                                log_warning("Failed to get SourcePath: %s", bus_error_message(&error, r));
-                                continue;
-                        }
-                }
-
                 r = sd_bus_get_property_strv(
                                 bus,
                                 "org.freedesktop.systemd1",
@@ -3748,8 +3730,6 @@ static int cat(sd_bus *bus, char **args) {
                         continue;
                 }
 
-                stdout = fdopen(STDOUT_FILENO, "a");
-
                 if (!isempty(fragment_path)) {
                         fprintf(stdout, "# %s\n", fragment_path);
                         fflush(stdout);
@@ -4933,7 +4913,7 @@ static int help_types(void) {
         const char *t;
 
         puts("Available unit types:");
-        for(i = 0; i < _UNIT_TYPE_MAX; i++) {
+        for (i = 0; i < _UNIT_TYPE_MAX; i++) {
                 t = unit_type_to_string(i);
                 if (t)
                         puts(t);