chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core/smack: downgrade info to debug
[elogind.git]
/
src
/
core
/
load-dropin.c
diff --git
a/src/core/load-dropin.c
b/src/core/load-dropin.c
index d53e77f706e042e61e0f300269e1f05e2516a381..95c9a386ca8efffc7a68cc951975cfd7e6e47454 100644
(file)
--- a/
src/core/load-dropin.c
+++ b/
src/core/load-dropin.c
@@
-168,9
+168,10
@@
int unit_load_dropin(Unit *u) {
}
if (!strv_isempty(strv)) {
}
if (!strv_isempty(strv)) {
- _cleanup_strv_free_ char **files = NULL, **f;
+ _cleanup_strv_free_ char **files = NULL;
+ char **f;
- r = conf_files_list_strv(&files, ".conf", (const char**) strv);
+ r = conf_files_list_strv(&files, ".conf",
NULL,
(const char**) strv);
if (r < 0) {
log_error("Failed to get list of configuration files: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to get list of configuration files: %s", strerror(-r));
return r;
@@
-183,6
+184,5
@@
int unit_load_dropin(Unit *u) {
}
}
}
}
-
return 0;
}
return 0;
}