diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-10-27 20:06:44 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-11-05 15:35:51 -0400 |
| commit | 9a82ab959237a181216d536fff9b37470ac44fcf (patch) | |
| tree | fe7349f6c468a5a5d9f3a7e7236b7c4d6f7840d1 | |
| parent | c4c50112ecc549e839582586d435dc170455c91b (diff) | |
tree-wide: drop unneded WHITESPACE param to extract_first_word
It's the default, and NULL is shorter.
| -rw-r--r-- | src/core/load-fragment.c | 8 | ||||
| -rw-r--r-- | src/core/main.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-network.c | 2 | ||||
| -rw-r--r-- | src/shared/conf-parser.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index cbc826809e..3651eb9634 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -606,7 +606,7 @@ int config_parse_exec( semicolon = false; - r = extract_first_word_and_warn(&p, &firstword, WHITESPACE, EXTRACT_QUOTES|EXTRACT_CUNESCAPE, unit, filename, line, rvalue); + r = extract_first_word_and_warn(&p, &firstword, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE, unit, filename, line, rvalue); if (r <= 0) return 0; @@ -695,7 +695,7 @@ int config_parse_exec( continue; } - r = extract_first_word_and_warn(&p, &word, WHITESPACE, EXTRACT_QUOTES|EXTRACT_CUNESCAPE, unit, filename, line, rvalue); + r = extract_first_word_and_warn(&p, &word, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE, unit, filename, line, rvalue); if (r == 0) break; else if (r < 0) @@ -1951,7 +1951,7 @@ int config_parse_user_group_strv( for (;;) { _cleanup_free_ char *word = NULL, *k = NULL; - r = extract_first_word(&p, &word, WHITESPACE, 0); + r = extract_first_word(&p, &word, NULL, 0); if (r == 0) break; if (r == -ENOMEM) @@ -2300,7 +2300,7 @@ int config_parse_pass_environ(const char *unit, for (;;) { _cleanup_free_ char *word = NULL; - r = extract_first_word(&rvalue, &word, WHITESPACE, EXTRACT_QUOTES); + r = extract_first_word(&rvalue, &word, NULL, EXTRACT_QUOTES); if (r == 0) break; if (r == -ENOMEM) diff --git a/src/core/main.c b/src/core/main.c index 94602611a7..e01fed6b7c 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -574,7 +574,7 @@ static int config_parse_join_controllers(const char *unit, char **l; int r; - r = extract_first_word(&rvalue, &word, WHITESPACE, EXTRACT_QUOTES); + r = extract_first_word(&rvalue, &word, NULL, EXTRACT_QUOTES); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, r, "Invalid value for %s: %s", lvalue, whole_rvalue); return r; diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 042232fcac..0dc00e874d 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1003,7 +1003,7 @@ int config_parse_dns( union in_addr_union a; int family; - r = extract_first_word(&rvalue, &w, WHITESPACE, EXTRACT_QUOTES|EXTRACT_RETAIN_ESCAPE); + r = extract_first_word(&rvalue, &w, NULL, EXTRACT_QUOTES|EXTRACT_RETAIN_ESCAPE); if (r == 0) break; if (r == -ENOMEM) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 19a371c865..265ac83dc0 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -781,7 +781,7 @@ int config_parse_strv(const char *unit, for (;;) { char *word = NULL; - r = extract_first_word(&rvalue, &word, WHITESPACE, EXTRACT_QUOTES|EXTRACT_RETAIN_ESCAPE); + r = extract_first_word(&rvalue, &word, NULL, EXTRACT_QUOTES|EXTRACT_RETAIN_ESCAPE); if (r == 0) break; if (r == -ENOMEM) |