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

conf-files: use proper enum for flags parameters

Browse Source
This commit is contained in:
Lennart Poettering
2025-06-06 09:04:38 +02:00
parent aab61a4ebc
commit 1de31f23a0
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/conf-files.c
+7 -7
View File
@@ -26,7 +26,7 @@ static int files_add(
Hashmap **files,
Set **masked,
const char *suffix,
unsigned flags) {
ConfFilesFlags flags) {
int r;
@@ -141,7 +141,7 @@ int conf_files_list_strv(
char ***ret,
const char *suffix,
const char *root,
unsigned flags,
ConfFilesFlags flags,
const char * const *dirs) {
_cleanup_hashmap_free_ Hashmap *fh = NULL;
@@ -175,7 +175,7 @@ int conf_files_list_strv_at(
char ***ret,
const char *suffix,
int rfd,
unsigned flags,
ConfFilesFlags flags,
const char * const *dirs) {
_cleanup_hashmap_free_ Hashmap *fh = NULL;
@@ -274,15 +274,15 @@ int conf_files_insert(char ***strv, const char *root, char **dirs, const char *p
return r;
}
int conf_files_list(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dir) {
int conf_files_list(char ***ret, const char *suffix, const char *root, ConfFilesFlags flags, const char *dir) {
return conf_files_list_strv(ret, suffix, root, flags, STRV_MAKE_CONST(dir));
}
int conf_files_list_at(char ***ret, const char *suffix, int rfd, unsigned flags, const char *dir) {
int conf_files_list_at(char ***ret, const char *suffix, int rfd, ConfFilesFlags flags, const char *dir) {
return conf_files_list_strv_at(ret, suffix, rfd, flags, STRV_MAKE_CONST(dir));
}
int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dirs) {
int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, ConfFilesFlags flags, const char *dirs) {
_cleanup_strv_free_ char **d = NULL;
assert(ret);
@@ -294,7 +294,7 @@ int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, un
return conf_files_list_strv(ret, suffix, root, flags, (const char**) d);
}
int conf_files_list_nulstr_at(char ***ret, const char *suffix, int rfd, unsigned flags, const char *dirs) {
int conf_files_list_nulstr_at(char ***ret, const char *suffix, int rfd, ConfFilesFlags flags, const char *dirs) {
_cleanup_strv_free_ char **d = NULL;
assert(ret);
src/basic/conf-files.h
+8 -8
View File
@@ -3,20 +3,20 @@
#include "forward.h"
enum {
typedef enum ConfFilesFlags {
CONF_FILES_EXECUTABLE = 1 << 0,
CONF_FILES_REGULAR = 1 << 1,
CONF_FILES_DIRECTORY = 1 << 2,
CONF_FILES_BASENAME = 1 << 3,
CONF_FILES_FILTER_MASKED = 1 << 4,
};
} ConfFilesFlags;
int conf_files_list(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dir);
int conf_files_list_at(char ***ret, const char *suffix, int rfd, 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_strv_at(char ***ret, const char *suffix, int rfd, 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_list_nulstr_at(char ***ret, const char *suffix, int rfd, unsigned flags, const char *dirs);
int conf_files_list(char ***ret, const char *suffix, const char *root, ConfFilesFlags flags, const char *dir);
int conf_files_list_at(char ***ret, const char *suffix, int rfd, ConfFilesFlags flags, const char *dir);
int conf_files_list_strv(char ***ret, const char *suffix, const char *root, ConfFilesFlags flags, const char* const* dirs);
int conf_files_list_strv_at(char ***ret, const char *suffix, int rfd, ConfFilesFlags flags, const char * const *dirs);
int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, ConfFilesFlags flags, const char *dirs);
int conf_files_list_nulstr_at(char ***ret, const char *suffix, int rfd, ConfFilesFlags flags, const char *dirs);
int conf_files_insert(char ***strv, const char *root, char **dirs, const char *path);
int conf_files_list_with_replacement(
const char *root,