Rename STRV_MAKE_EMPTY to just STRV_EMPTY

Even though this creates a stack allocation, it is not a function macro, so
drop the "make" from the name.

diff --git a/src/basic/macro.h b/src/basic/macro.h
index caefa7c57c6faac9a7e9af7d687dd4869f45cd3d..3ddc5272b856c9956c9de70ca20dee33c3bf0b5b 100644 (file)
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -152,7 +152,7 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
         } while (false)
 
 #define STRV_MAKE(...) ((char**) ((const char*[]) { __VA_ARGS__, NULL }))
-#define STRV_MAKE_EMPTY ((char*[1]) { NULL })
+#define STRV_EMPTY ((char*[1]) { NULL })
 #define STRV_MAKE_CONST(...) ((const char* const*) ((const char*[]) { __VA_ARGS__, NULL }))
 
 /* Pointers range from NULL to POINTER_MAX */

diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index 77e321d94c84b5b4553926e740049a3da8552582..e2f9f28792e21b5408167bec091f841aa169b843 100644 (file)
--- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c
@@ -171,14 +171,14 @@ TEST(config_parse_unsigned) {
 }
 
 TEST(config_parse_strv) {
-        test_config_parse_strv_one("", false, STRV_MAKE_EMPTY);
+        test_config_parse_strv_one("", false, STRV_EMPTY);
         test_config_parse_strv_one("foo", false, STRV_MAKE("foo"));
         test_config_parse_strv_one("foo bar foo", false, STRV_MAKE("foo", "bar", "foo"));
         test_config_parse_strv_one("\"foo bar\" foo", false, STRV_MAKE("foo bar", "foo"));
         test_config_parse_strv_one("\xc3\x80", false, STRV_MAKE("\xc3\x80"));
         test_config_parse_strv_one("\xc3\x7f", false, STRV_MAKE("\xc3\x7f"));
 
-        test_config_parse_strv_one("", true, STRV_MAKE_EMPTY);
+        test_config_parse_strv_one("", true, STRV_EMPTY);
         test_config_parse_strv_one("foo", true, STRV_MAKE("foo"));
         test_config_parse_strv_one("foo bar foo", true, STRV_MAKE("foo", "bar"));
         test_config_parse_strv_one("\"foo bar\" foo", true, STRV_MAKE("foo bar", "foo"));

diff --git a/src/test/test-nulstr-util.c b/src/test/test-nulstr-util.c
index 5110435778ac5ea850681fb82c75ce114aa48961..bb0f1b32d1f84f77d27e625c56a984d0829bc43a 100644 (file)
--- a/src/test/test-nulstr-util.c
+++ b/src/test/test-nulstr-util.c
@@ -42,22 +42,22 @@ TEST(strv_parse_nulstr_full) {
                                    STRV_MAKE("hoge", "hoge2", "hoge3", "", "hoge5", "", "xxx"));
 
         strv_parse_nulstr_full_one(((const char[0]) {}), 0,
-                                   STRV_MAKE_EMPTY, STRV_MAKE_EMPTY);
+                                   STRV_EMPTY, STRV_EMPTY);
 
         strv_parse_nulstr_full_one(((const char[1]) { 0 }), 1,
-                                   STRV_MAKE(""), STRV_MAKE_EMPTY);
+                                   STRV_MAKE(""), STRV_EMPTY);
 
         strv_parse_nulstr_full_one(((const char[1]) { 'x' }), 1,
                                    STRV_MAKE("x"), STRV_MAKE("x"));
 
         strv_parse_nulstr_full_one(((const char[2]) { 0, 0 }), 2,
-                                   STRV_MAKE("", ""), STRV_MAKE_EMPTY);
+                                   STRV_MAKE("", ""), STRV_EMPTY);
 
         strv_parse_nulstr_full_one(((const char[2]) { 'x', 0 }), 2,
                                    STRV_MAKE("x"), STRV_MAKE("x"));
 
         strv_parse_nulstr_full_one(((const char[3]) { 0, 0, 0 }), 3,
-                                   STRV_MAKE("", "", ""), STRV_MAKE_EMPTY);
+                                   STRV_MAKE("", "", ""), STRV_EMPTY);
 
         strv_parse_nulstr_full_one(((const char[3]) { 'x', 0, 0 }), 3,
                                    STRV_MAKE("x", ""), STRV_MAKE("x"));

diff --git a/src/test/test-proc-cmdline.c b/src/test/test-proc-cmdline.c
index 478974b0a9a14d0e4e4843264bf7dbb8ebfbfd7e..68c4e77f75a22b0736888497c8e64c7ba0f9a357 100644 (file)
--- a/src/test/test-proc-cmdline.c
+++ b/src/test/test-proc-cmdline.c
@@ -244,7 +244,7 @@ TEST(proc_cmdline_key_startswith) {
 
 TEST(proc_cmdline_filter_pid1_args) {
         test_proc_cmdline_filter_pid1_args_one("systemd\0",
-                                               STRV_MAKE_EMPTY);
+                                               STRV_EMPTY);
 
         /* short option */
         test_proc_cmdline_filter_pid1_args_one("systemd\0"

diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c
index 86b1f5f2e01473bb98bbb7937e788b6e0cb02f29..bd66722456c35e353b6aa705f78aaa9200ac539d 100644 (file)
--- a/src/test/test-serialize.c
+++ b/src/test/test-serialize.c
@@ -110,7 +110,7 @@ TEST(serialize_strv) {
         log_info("/* %s (%s) */", __func__, fn);
 
         assert_se(serialize_strv(f, "strv1", NULL) == 0);
-        assert_se(serialize_strv(f, "strv2", STRV_MAKE_EMPTY) == 0);
+        assert_se(serialize_strv(f, "strv2", STRV_EMPTY) == 0);
         assert_se(serialize_strv(f, "strv3", strv) == 1);
         assert_se(serialize_strv(f, "strv4", STRV_MAKE(long_string)) == -EINVAL);
 

diff --git a/src/test/test-socket-bind.c b/src/test/test-socket-bind.c
index f6f48f67232986af255cf369564fdf840c1d202a..fec8269f2b155db3b6f92d38542d8a6754a02876 100644 (file)
--- a/src/test/test-socket-bind.c
+++ b/src/test/test-socket-bind.c
@@ -139,7 +139,7 @@ int main(int argc, char *argv[]) {
         assert_se(test_socket_bind(m, "socket_bind_test.service", netcat_path, "2000", STRV_MAKE("ipv6:2001-2002"), STRV_MAKE("any")) >= 0);
         assert_se(test_socket_bind(m, "socket_bind_test.service", netcat_path, "6666", STRV_MAKE("ipv4:6666", "6667"), STRV_MAKE("any")) >= 0);
         assert_se(test_socket_bind(m, "socket_bind_test.service", netcat_path, "6666", STRV_MAKE("6667", "6668", ""), STRV_MAKE("any")) >= 0);
-        assert_se(test_socket_bind(m, "socket_bind_test.service", netcat_path, "7777", STRV_MAKE_EMPTY, STRV_MAKE_EMPTY) >= 0);
+        assert_se(test_socket_bind(m, "socket_bind_test.service", netcat_path, "7777", STRV_EMPTY, STRV_EMPTY) >= 0);
         assert_se(test_socket_bind(m, "socket_bind_test.service", netcat_path, "8888", STRV_MAKE("any"), STRV_MAKE("any")) >= 0);
         assert_se(test_socket_bind(m, "socket_bind_test.service", netcat_path, "8888", STRV_MAKE("ipv6:tcp:8888-8889"), STRV_MAKE("any")) >= 0);
         assert_se(test_socket_bind(m, "socket_bind_test.service", netcat_path, "10000", STRV_MAKE("ipv6:udp:9999-10000"), STRV_MAKE("any")) >= 0);

diff --git a/src/test/test-string-util.c b/src/test/test-string-util.c
index 2439dd12ecc6d8cce95f15f337703f73a3fd846a..90ac5797075371ecb2dc0af748d74da324571db8 100644 (file)
--- a/src/test/test-string-util.c
+++ b/src/test/test-string-util.c
@@ -496,7 +496,7 @@ TEST(foreach_word_quoted) {
               true);
 
         check("test\\",
-              STRV_MAKE_EMPTY,
+              STRV_EMPTY,
               true);
 }
 

diff --git a/src/test/test-strv.c b/src/test/test-strv.c
index d2524fb52b45b6498296d538bdb28c99cfa0ff23..88505993cddcafad825443aadd3de62c3f6f33be 100644 (file)
--- a/src/test/test-strv.c
+++ b/src/test/test-strv.c
@@ -224,9 +224,9 @@ static void test_strv_unquote_one(const char *quoted, char **list) {
 
 TEST(strv_unquote) {
         test_strv_unquote_one("    foo=bar     \"waldo\"    zzz    ", STRV_MAKE("foo=bar", "waldo", "zzz"));
-        test_strv_unquote_one("", STRV_MAKE_EMPTY);
-        test_strv_unquote_one(" ", STRV_MAKE_EMPTY);
-        test_strv_unquote_one("   ", STRV_MAKE_EMPTY);
+        test_strv_unquote_one("", STRV_EMPTY);
+        test_strv_unquote_one(" ", STRV_EMPTY);
+        test_strv_unquote_one("   ", STRV_EMPTY);
         test_strv_unquote_one("   x", STRV_MAKE("x"));
         test_strv_unquote_one("x   ", STRV_MAKE("x"));
         test_strv_unquote_one("  x   ", STRV_MAKE("x"));
@@ -774,7 +774,7 @@ TEST(strv_foreach_backwards) {
         STRV_FOREACH_BACKWARDS(check, (char**) NULL)
                 assert_not_reached();
 
-        STRV_FOREACH_BACKWARDS(check, STRV_MAKE_EMPTY)
+        STRV_FOREACH_BACKWARDS(check, STRV_EMPTY)
                 assert_not_reached();
 
         unsigned count = 0;
@@ -1049,7 +1049,7 @@ TEST(strv_fnmatch) {
         _cleanup_strv_free_ char **v = NULL;
         size_t pos;
 
-        assert_se(!strv_fnmatch(STRV_MAKE_EMPTY, "a"));
+        assert_se(!strv_fnmatch(STRV_EMPTY, "a"));
 
         v = strv_new("xxx", "*\\*", "yyy");
         assert_se(!strv_fnmatch_full(v, "\\", 0, NULL));

diff --git a/src/test/test-verbs.c b/src/test/test-verbs.c
index 03b4836e908f977ef6dc13c79e2b99517a927eda..a28fc9b55b274012aa7d04721e700d899881c98f 100644 (file)
--- a/src/test/test-verbs.c
+++ b/src/test/test-verbs.c
@@ -43,7 +43,7 @@ TEST(verbs) {
         test_dispatch_one(STRV_MAKE("copy-to", "foo", "bar", "baz", "quux", "qaax"), verbs, -EINVAL);
 
         /* no verb, but a default is set */
-        test_dispatch_one(STRV_MAKE_EMPTY, verbs, 0);
+        test_dispatch_one(STRV_EMPTY, verbs, 0);
 }
 
 TEST(verbs_no_default) {