SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13354 from keszybz/two-refactoring-patches

Browse Source 
Two or more refactoring patches
This commit is contained in:
Yu Watanabe
2019-09-16 21:24:13 +09:00
committed by GitHub
parent 71de68476c 36b12282e1
commit f39fc2d88b
6 changed files with 54 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/conf-files.c
+2 -6
View File
@@ -261,16 +261,12 @@ int conf_files_list_strv(char ***strv, const char *suffix, const char *root, uns
return conf_files_list_strv_internal(strv, suffix, root, flags, copy);
}
int conf_files_list(char ***strv, const char *suffix, const char *root, unsigned flags, const char *dir, ...) {
int conf_files_list(char ***strv, const char *suffix, const char *root, unsigned flags, const char *dir) {
_cleanup_strv_free_ char **dirs = NULL;
va_list ap;
assert(strv);
va_start(ap, dir);
dirs = strv_new_ap(dir, ap);
va_end(ap);
dirs = strv_new(dir);
if (!dirs)
return -ENOMEM;
src/basic/conf-files.h
+1 -1
View File
@@ -11,7 +11,7 @@ enum {
CONF_FILES_FILTER_MASKED = 1 << 4,
};
int conf_files_list(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dir, ...) _sentinel_;
int conf_files_list(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dir);
int conf_files_list_strv(char ***ret, const char *suffix, const char *root, unsigned flags, const char* const* dirs);
int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dirs);
int conf_files_insert(char ***strv, const char *root, char **dirs, const char *path);