From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 12 Nov 2018 10:58:58 +0000 (+0100)
Subject: proc-cmdline: turn flags parameter into a proper typedef'ed enum
X-Git-Tag: v240~320^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6dd5e7c189bf4577541a37e062bd877273823ff;p=thirdparty%2Fsystemd.git

proc-cmdline: turn flags parameter into a proper typedef'ed enum

Let's add some extra typesafety.
---

diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c
index 205ea08f6da..a52e58002eb 100644
--- a/src/basic/proc-cmdline.c
+++ b/src/basic/proc-cmdline.c
@@ -39,7 +39,7 @@ int proc_cmdline(char **ret) {
                 return read_one_line_file("/proc/cmdline", ret);
 }
 
-int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item, void *data, unsigned flags) {
+int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item, void *data, ProcCmdlineFlags flags) {
         const char *p;
         int r;
 
@@ -82,7 +82,7 @@ int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item,
         return 0;
 }
 
-int proc_cmdline_parse(proc_cmdline_parse_t parse_item, void *data, unsigned flags) {
+int proc_cmdline_parse(proc_cmdline_parse_t parse_item, void *data, ProcCmdlineFlags flags) {
         _cleanup_free_ char *line = NULL;
         int r;
 
@@ -127,7 +127,7 @@ bool proc_cmdline_key_streq(const char *x, const char *y) {
         return true;
 }
 
-int proc_cmdline_get_key(const char *key, unsigned flags, char **value) {
+int proc_cmdline_get_key(const char *key, ProcCmdlineFlags flags, char **value) {
         _cleanup_free_ char *line = NULL, *ret = NULL;
         bool found = false;
         const char *p;
diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h
index efa88df0a05..cf04cb46c26 100644
--- a/src/basic/proc-cmdline.h
+++ b/src/basic/proc-cmdline.h
@@ -5,20 +5,20 @@
 
 #include "log.h"
 
-enum {
+typedef enum ProcCmdlineFlags {
         PROC_CMDLINE_STRIP_RD_PREFIX = 1 << 0,
         PROC_CMDLINE_VALUE_OPTIONAL  = 1 << 1,
         PROC_CMDLINE_RD_STRICT       = 1 << 2,
-};
+} ProcCmdlineFlags;
 
 typedef int (*proc_cmdline_parse_t)(const char *key, const char *value, void *data);
 
 int proc_cmdline(char **ret);
 
-int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item, void *data, unsigned flags);
-int proc_cmdline_parse(const proc_cmdline_parse_t parse, void *userdata, unsigned flags);
+int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item, void *data, ProcCmdlineFlags flags);
+int proc_cmdline_parse(const proc_cmdline_parse_t parse, void *userdata, ProcCmdlineFlags flags);
 
-int proc_cmdline_get_key(const char *parameter, unsigned flags, char **value);
+int proc_cmdline_get_key(const char *parameter, ProcCmdlineFlags flags, char **value);
 int proc_cmdline_get_bool(const char *key, bool *ret);
 
 char *proc_cmdline_key_startswith(const char *s, const char *prefix);