diff options
| author | Antonio Alvarez Feijoo <antonio.feijoo@suse.com> | 2024-03-05 08:50:07 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2024-03-05 13:21:42 +0100 |
| commit | 43aca0d99e302ab4bd703bec920c3f6de9591392 (patch) | |
| tree | 03262c061f45b8c410b3a65e0eb2cf6b10cd70d7 | |
| parent | sd-netlink: allow to call rtnl_get_link_info() without iftype and flags (diff) | |
| download | systemd-43aca0d99e302ab4bd703bec920c3f6de9591392.tar.xz systemd-43aca0d99e302ab4bd703bec920c3f6de9591392.zip | |
extract-word: update remaining calls to `extract_many_words`
Follow-up to 4f49512695f8214c55c206b3c2f583dc7b309e1b
| -rw-r--r-- | src/core/execute-serialize.c | 9 | ||||
| -rw-r--r-- | src/shared/firewall-util-nft.c | 2 | ||||
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/core/execute-serialize.c b/src/core/execute-serialize.c index 98ae2b0bcd..5782c2f175 100644 --- a/src/core/execute-serialize.c +++ b/src/core/execute-serialize.c @@ -3498,8 +3498,7 @@ static int exec_context_deserialize(ExecContext *c, FILE *f) { NULL, EXTRACT_UNQUOTE|EXTRACT_CUNESCAPE|EXTRACT_UNESCAPE_SEPARATORS, &source, - &destination, - NULL); + &destination); if (r < 0) return r; if (r == 0) @@ -3531,8 +3530,7 @@ static int exec_context_deserialize(ExecContext *c, FILE *f) { ":", EXTRACT_CUNESCAPE|EXTRACT_UNESCAPE_SEPARATORS, &partition, - &opts, - NULL); + &opts); if (r < 0) return r; if (r == 0) @@ -3612,8 +3610,7 @@ static int exec_context_deserialize(ExecContext *c, FILE *f) { ":", EXTRACT_CUNESCAPE|EXTRACT_UNESCAPE_SEPARATORS, &partition, - &opts, - NULL); + &opts); if (r < 0) return r; if (r == 0) diff --git a/src/shared/firewall-util-nft.c b/src/shared/firewall-util-nft.c index fe986ed212..e9bd286786 100644 --- a/src/shared/firewall-util-nft.c +++ b/src/shared/firewall-util-nft.c @@ -1316,7 +1316,7 @@ int config_parse_nft_set( return 0; q = tuple; - r = extract_many_words(&q, ":", EXTRACT_CUNESCAPE, &source_str, &family_str, &table, &set, NULL); + r = extract_many_words(&q, ":", EXTRACT_CUNESCAPE, &source_str, &family_str, &table, &set); if (r == -ENOMEM) return log_oom(); if (r != 4 || !isempty(q)) { diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 7388024556..aad740a2b8 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -3649,8 +3649,7 @@ static int parse_line( &mode, &user, &group, - &age, - NULL); + &age); if (r < 0) { if (IN_SET(r, -EINVAL, -EBADSLT)) /* invalid quoting and such or an unknown specifier */ |