From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Apr 2022 13:41:09 +0000 (+0200)
Subject: chase-symlinks: use proper typedef for flags argument
X-Git-Tag: v251-rc2~134^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f47f880a44be97635ac085d67ac33e217c1607d;p=thirdparty%2Fsystemd.git

chase-symlinks: use proper typedef for flags argument
---

diff --git a/src/basic/chase-symlinks.c b/src/basic/chase-symlinks.c
index 61f8b3351be..8558944a69c 100644
--- a/src/basic/chase-symlinks.c
+++ b/src/basic/chase-symlinks.c
@@ -24,7 +24,7 @@ bool unsafe_transition(const struct stat *a, const struct stat *b) {
         return a->st_uid != b->st_uid; /* Otherwise we need to stay within the same UID */
 }
 
-static int log_unsafe_transition(int a, int b, const char *path, unsigned flags) {
+static int log_unsafe_transition(int a, int b, const char *path, ChaseSymlinksFlags flags) {
         _cleanup_free_ char *n1 = NULL, *n2 = NULL, *user_a = NULL, *user_b = NULL;
         struct stat st;
 
@@ -44,7 +44,7 @@ static int log_unsafe_transition(int a, int b, const char *path, unsigned flags)
                                  strna(n1), strna(user_a), special_glyph(SPECIAL_GLYPH_ARROW_RIGHT), strna(n2), strna(user_b), path);
 }
 
-static int log_autofs_mount_point(int fd, const char *path, unsigned flags) {
+static int log_autofs_mount_point(int fd, const char *path, ChaseSymlinksFlags flags) {
         _cleanup_free_ char *n1 = NULL;
 
         if (!FLAGS_SET(flags, CHASE_WARN))
@@ -57,7 +57,13 @@ static int log_autofs_mount_point(int fd, const char *path, unsigned flags) {
                                  strna(n1), path);
 }
 
-int chase_symlinks(const char *path, const char *original_root, unsigned flags, char **ret_path, int *ret_fd) {
+int chase_symlinks(
+                const char *path,
+                const char *original_root,
+                ChaseSymlinksFlags flags,
+                char **ret_path,
+                int *ret_fd) {
+
         _cleanup_free_ char *buffer = NULL, *done = NULL, *root = NULL;
         _cleanup_close_ int fd = -1;
         unsigned max_follow = CHASE_SYMLINKS_MAX; /* how many symlinks to follow before giving up and returning ELOOP */
@@ -397,7 +403,7 @@ chased_one:
 int chase_symlinks_and_open(
                 const char *path,
                 const char *root,
-                unsigned chase_flags,
+                ChaseSymlinksFlags chase_flags,
                 int open_flags,
                 char **ret_path) {
 
@@ -435,7 +441,7 @@ int chase_symlinks_and_open(
 int chase_symlinks_and_opendir(
                 const char *path,
                 const char *root,
-                unsigned chase_flags,
+                ChaseSymlinksFlags chase_flags,
                 char **ret_path,
                 DIR **ret_dir) {
 
@@ -478,7 +484,7 @@ int chase_symlinks_and_opendir(
 int chase_symlinks_and_stat(
                 const char *path,
                 const char *root,
-                unsigned chase_flags,
+                ChaseSymlinksFlags chase_flags,
                 char **ret_path,
                 struct stat *ret_stat,
                 int *ret_fd) {
@@ -520,7 +526,7 @@ int chase_symlinks_and_stat(
 int chase_symlinks_and_fopen_unlocked(
                 const char *path,
                 const char *root,
-                unsigned chase_flags,
+                ChaseSymlinksFlags chase_flags,
                 const char *open_flags,
                 char **ret_path,
                 FILE **ret_file) {
diff --git a/src/basic/chase-symlinks.h b/src/basic/chase-symlinks.h
index e2b22fe0412..491138a698b 100644
--- a/src/basic/chase-symlinks.h
+++ b/src/basic/chase-symlinks.h
@@ -6,7 +6,7 @@
 
 #include "stat-util.h"
 
-enum {
+typedef enum ChaseSymlinksFlags {
         CHASE_PREFIX_ROOT = 1 << 0, /* The specified path will be prefixed by the specified root before beginning the iteration */
         CHASE_NONEXISTENT = 1 << 1, /* It's OK if the path doesn't actually exist. */
         CHASE_NO_AUTOFS   = 1 << 2, /* Return -EREMOTE if autofs mount point found */
@@ -16,17 +16,17 @@ enum {
         CHASE_NOFOLLOW    = 1 << 6, /* Do not follow the path's right-most component. With ret_fd, when the path's
                                      * right-most component refers to symlink, return O_PATH fd of the symlink. */
         CHASE_WARN        = 1 << 7, /* Emit an appropriate warning when an error is encountered */
-};
+} ChaseSymlinksFlags;
 
 bool unsafe_transition(const struct stat *a, const struct stat *b);
 
 /* How many iterations to execute before returning -ELOOP */
 #define CHASE_SYMLINKS_MAX 32
 
-int chase_symlinks(const char *path_with_prefix, const char *root, unsigned flags, char **ret_path, int *ret_fd);
+int chase_symlinks(const char *path_with_prefix, const char *root, ChaseSymlinksFlags chase_flags, char **ret_path, int *ret_fd);
 
-int chase_symlinks_and_open(const char *path, const char *root, unsigned chase_flags, int open_flags, char **ret_path);
-int chase_symlinks_and_opendir(const char *path, const char *root, unsigned chase_flags, char **ret_path, DIR **ret_dir);
-int chase_symlinks_and_stat(const char *path, const char *root, unsigned chase_flags, char **ret_path, struct stat *ret_stat, int *ret_fd);
+int chase_symlinks_and_open(const char *path, const char *root, ChaseSymlinksFlags chase_flags, int open_flags, char **ret_path);
+int chase_symlinks_and_opendir(const char *path, const char *root, ChaseSymlinksFlags chase_flags, char **ret_path, DIR **ret_dir);
+int chase_symlinks_and_stat(const char *path, const char *root, ChaseSymlinksFlags chase_flags, char **ret_path, struct stat *ret_stat, int *ret_fd);
 
-int chase_symlinks_and_fopen_unlocked(const char *path, const char *root, unsigned chase_flags, const char *open_flags, char **ret_path, FILE **ret_file);
+int chase_symlinks_and_fopen_unlocked(const char *path, const char *root, ChaseSymlinksFlags chase_flags, const char *open_flags, char **ret_path, FILE **ret_file);