From 2a6911bb1f8e2dbc0259957a8c9e79cc48399f88 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 23 Mar 2023 04:55:59 +0900 Subject: [PATCH] proc-cmdline: make proc_cmdline_parse_given() static It is used only in proc-cmdline.c and its test. And the test can be covered by proc_cmdline_parse(). --- src/basic/proc-cmdline.c | 2 +- src/basic/proc-cmdline.h | 1 - src/test/test-proc-cmdline.c | 10 +++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/basic/proc-cmdline.c b/src/basic/proc-cmdline.c index 4f4ea869bf..de1f66635a 100644 --- a/src/basic/proc-cmdline.c +++ b/src/basic/proc-cmdline.c @@ -79,7 +79,7 @@ static int proc_cmdline_extract_first(const char **p, char **ret_word, ProcCmdli return 0; } -int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item, void *data, ProcCmdlineFlags flags) { +static int proc_cmdline_parse_given(const char *line, proc_cmdline_parse_t parse_item, void *data, ProcCmdlineFlags flags) { const char *p; int r; diff --git a/src/basic/proc-cmdline.h b/src/basic/proc-cmdline.h index 45f3a27f27..8650e293ce 100644 --- a/src/basic/proc-cmdline.h +++ b/src/basic/proc-cmdline.h @@ -16,7 +16,6 @@ typedef int (*proc_cmdline_parse_t)(const char *key, const char *value, void *da int proc_cmdline(char **ret); -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, ProcCmdlineFlags flags, char **value); diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c index b576c46c23..37076c8adb 100644 --- a/src/test/test-proc-cmdline.c +++ b/src/test/test-proc-cmdline.c @@ -90,17 +90,17 @@ static void test_proc_cmdline_given_one(bool flip_initrd) { in_initrd_force(!in_initrd()); bool t = true, f = false; - assert_se(proc_cmdline_parse_given("foo_bar=quux wuff-piep=\"tuet \" rd.zumm space='x y z' miepf=\"uuu\"", - parse_item_given, &t, PROC_CMDLINE_STRIP_RD_PREFIX) >= 0); - - assert_se(proc_cmdline_parse_given("foo_bar=quux wuff-piep=\"tuet \" rd.zumm space='x y z' miepf=\"uuu\"", - parse_item_given, &f, 0) >= 0); + assert_se(proc_cmdline_parse(parse_item_given, &t, PROC_CMDLINE_STRIP_RD_PREFIX) >= 0); + assert_se(proc_cmdline_parse(parse_item_given, &f, 0) >= 0); if (flip_initrd) in_initrd_force(!in_initrd()); } TEST(test_proc_cmdline_given) { + assert_se(putenv((char*) "SYSTEMD_PROC_CMDLINE=foo_bar=quux wuff-piep=\"tuet \" rd.zumm space='x y z' miepf=\"uuu\"") == 0); + assert_se(putenv((char*) "SYSTEMD_EFI_OPTIONS=miepf=\"uuu\"") == 0); + test_proc_cmdline_given_one(false); /* Repeat the same thing, but now flip our ininitrdness */ test_proc_cmdline_given_one(true); -- 2.25.1