dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

extract-word: update remaining calls to extract_many_words

Browse Source 
Follow-up to 4f49512695
This commit is contained in:
Antonio Alvarez Feijoo
2024-03-05 08:50:07 +01:00
committed by Luca Boccassi
parent 21fdecdc13
commit 43aca0d99e
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/execute-serialize.c
View File

@@ -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)

2
src/shared/firewall-util-nft.c
View File

@@ -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)) {

3
src/tmpfiles/tmpfiles.c
View File

@@ -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 */