From: Zbigniew Jędrzejewski-Szmek Date: Sun, 22 Jan 2017 19:16:19 +0000 (-0500) Subject: basic/conf-files: extend conf_files_list() to list unsuffixed files X-Git-Tag: v233.3~96 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ad9dde19eb48a67aa202f767f07fd6d0be547506 basic/conf-files: extend conf_files_list() to list unsuffixed files 5dd11ab5f36ce71138005 did a similar change for conf_files_list_strv(). Here we do the same for conf_files_list() and conf_files_list_nulstr(). No change for existing users. Tests are added. --- diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c index 950bdf53d..b95302963 100644 --- a/src/basic/conf-files.c +++ b/src/basic/conf-files.c @@ -141,7 +141,6 @@ int conf_files_list(char ***strv, const char *suffix, const char *root, const ch va_list ap; assert(strv); - assert(suffix); va_start(ap, dir); dirs = strv_new_ap(dir, ap); @@ -158,7 +157,6 @@ int conf_files_list_nulstr(char ***strv, const char *suffix, const char *root, c _cleanup_strv_free_ char **dirs = NULL; assert(strv); - assert(suffix); dirs = strv_split_nulstr(d); if (!dirs)