From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 6 Jun 2025 06:33:31 +0000 (+0200)
Subject: conf-files: use proper enum for flags parameters
X-Git-Tag: v258-rc1~372^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1de31f23a0f9a11d483728dadb2e6897b98b318b;p=thirdparty%2Fsystemd.git

conf-files: use proper enum for flags parameters
---

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index 2461235fe8a..644bd170cac 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -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);
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h
index fb479cabf9e..2bee1448e49 100644
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -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,