picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

basic/dirent-util: allow suffix to be omitted for dirent_is_file_with_suffix

Browse source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-02-07 21:06:38 -05:00
parent cfe5b07106
commit 5dd11ab5f3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/basic/conf-files.c
View file

@ -43,7 +43,6 @@ static int files_add(Hashmap *h, const char *root, const char *path, const char
int r;
assert(path);
assert(suffix);
dirpath = prefix_roota(root, path);
@ -94,7 +93,6 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
int r;
assert(strv);
assert(suffix);
/* This alters the dirs string array */
if (!path_strv_resolve_uniq(dirs, root))
@ -126,7 +124,6 @@ int conf_files_list_strv(char ***strv, const char *suffix, const char *root, con
_cleanup_strv_free_ char **copy = NULL;
assert(strv);
assert(suffix);
copy = strv_copy((char**) dirs);
if (!copy)

3
src/basic/dirent-util.c
View file

@ -70,5 +70,8 @@ bool dirent_is_file_with_suffix(const struct dirent *de, const char *suffix) {
if (de->d_name[0] == '.')
return false;
if (!suffix)
return true;
return endswith(de->d_name, suffix);
}