X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fproc-cmdline.h;h=46d0d76ff2d41f7e403ae727f9e331d3782e5ed5;hp=e5a7d79340377863f2e52656e91264b23d3957a5;hb=9b00a533195b7fec54a791ca02090e0799214770;hpb=b96ed50e3493103d075ff2ce4c3fbad8f26b2e22

diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h
index e5a7d7934..46d0d76ff 100644
--- a/src/basic/proc-cmdline.h
+++ b/src/basic/proc-cmdline.h
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 #pragma once
 
 /***
@@ -21,9 +19,40 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdbool.h>
+
+#include "log.h"
+
+enum {
+        PROC_CMDLINE_STRIP_RD_PREFIX = 1,
+        PROC_CMDLINE_VALUE_OPTIONAL = 2,
+};
+
+typedef int (*proc_cmdline_parse_t)(const char *key, const char *value, void *data);
+
 int proc_cmdline(char **ret);
-int parse_proc_cmdline(int (*parse_word)(const char *key, const char *value));
-int get_proc_cmdline_key(const char *parameter, char **value);
 
-// UNNEEDED int shall_restore_state(void);
-// UNNEEDED const char* runlevel_to_target(const char *rl);
+int proc_cmdline_parse(const proc_cmdline_parse_t parse, void *userdata, unsigned flags);
+
+#if 0 /// UNNEEDED by elogind
+int proc_cmdline_get_key(const char *parameter, unsigned flags, char **value);
+int proc_cmdline_get_bool(const char *key, bool *ret);
+
+char *proc_cmdline_key_startswith(const char *s, const char *prefix);
+#endif // 0
+bool proc_cmdline_key_streq(const char *x, const char *y);
+
+#if 0 /// UNNEEDED by elogind
+int shall_restore_state(void);
+const char* runlevel_to_target(const char *rl);
+#endif // 0
+
+/* A little helper call, to be used in proc_cmdline_parse_t callbacks */
+static inline bool proc_cmdline_value_missing(const char *key, const char *value) {
+        if (!value) {
+                log_warning("Missing argument for %s= kernel command line switch, ignoring.", key);
+                return true;
+        }
+
+        return false;
+}