From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 22 Jul 2017 12:54:27 +0000 (-0400)
Subject: shared/dropin: improve error message
X-Git-Tag: v235~300^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f6de63bf73b79fd19ece75844cd33bc6f188fa7;p=thirdparty%2Fsystemd.git

shared/dropin: improve error message

We're not just sorting, but actually creating the list. We can
also use the output parameter directly, without a temporary variable.
---

diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 15ccd1b6cac..7d8fbeb4359 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -187,7 +187,7 @@ int unit_file_find_dropin_paths(
                 Set *names,
                 char ***ret) {
 
-        _cleanup_strv_free_ char **dirs = NULL, **ans = NULL;
+        _cleanup_strv_free_ char **dirs = NULL;
         Iterator i;
         char *t, **p;
         int r;
@@ -203,12 +203,9 @@ int unit_file_find_dropin_paths(
                 return 0;
         }
 
-        r = conf_files_list_strv(&ans, file_suffix, NULL, (const char**) dirs);
+        r = conf_files_list_strv(ret, file_suffix, NULL, (const char**) dirs);
         if (r < 0)
-                return log_warning_errno(r, "Failed to sort the list of configuration files: %m");
-
-        *ret = ans;
-        ans = NULL;
+                return log_warning_errno(r, "Failed to create the list of configuration files: %m");
 
         return 1;
 }