dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

shared/dropin: improve error message

Browse Source 
We're not just sorting, but actually creating the list. We can
also use the output parameter directly, without a temporary variable.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-07-22 08:54:27 -04:00
parent 9e4ea9cc34
commit 3f6de63bf7
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/shared/dropin.c
View File

@@ -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;
}