X Tutup
Skip to content

Commit 4ec8514

Browse files
keszybzkeszybz
committed
Rename EXTRACT_QUOTES to EXTRACT_UNQUOTE
Whenever I see EXTRACT_QUOTES, I'm always confused whether it means to leave the quotes in or to take them out. Let's say "unquote", like we say "cunescape".
1 parent cae90de commit 4ec8514

24 files changed

+93
-93
lines changed

‎src/basic/cap-list.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ int capability_set_from_string(const char *s, uint64_t *set) {
100100
_cleanup_free_ char *word = NULL;
101101
int r;
102102

103-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
103+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
104104
if (r == -ENOMEM)
105105
return r;
106106
if (r <= 0)

‎src/basic/env-util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ char **replace_env_argv(char **argv, char **env) {
688688
if (e) {
689689
int r;
690690

691-
r = strv_split_extract(&m, e, WHITESPACE, EXTRACT_RELAX|EXTRACT_QUOTES);
691+
r = strv_split_extract(&m, e, WHITESPACE, EXTRACT_RELAX|EXTRACT_UNQUOTE);
692692
if (r < 0) {
693693
ret[k] = NULL;
694694
strv_free(ret);

‎src/basic/extract-word.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra
135135
for (;; (*p)++, c = **p) {
136136
if (c == 0)
137137
goto finish_force_terminate;
138-
else if (IN_SET(c, '\'', '"') && (flags & EXTRACT_QUOTES)) {
138+
else if (IN_SET(c, '\'', '"') && (flags & EXTRACT_UNQUOTE)) {
139139
quote = c;
140140
break;
141141
} else if (c == '\\' && !(flags & EXTRACT_RETAIN_ESCAPE)) {

‎src/basic/extract-word.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ typedef enum ExtractFlags {
77
EXTRACT_RELAX = 1 << 0,
88
EXTRACT_CUNESCAPE = 1 << 1,
99
EXTRACT_CUNESCAPE_RELAX = 1 << 2,
10-
EXTRACT_QUOTES = 1 << 3,
10+
EXTRACT_UNQUOTE = 1 << 3,
1111
EXTRACT_DONT_COALESCE_SEPARATORS = 1 << 4,
1212
EXTRACT_RETAIN_ESCAPE = 1 << 5,
1313
} ExtractFlags;

‎src/basic/proc-cmdline.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static int proc_cmdline_extract_first(const char **p, char **ret_word, ProcCmdli
4747
_cleanup_free_ char *word = NULL;
4848
const char *c;
4949

50-
r = extract_first_word(&q, &word, NULL, EXTRACT_QUOTES|EXTRACT_RELAX);
50+
r = extract_first_word(&q, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RELAX);
5151
if (r < 0)
5252
return r;
5353
if (r == 0)

‎src/core/device.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ static int device_add_udev_wants(Unit *u, sd_device *dev) {
374374
for (;;) {
375375
_cleanup_free_ char *word = NULL, *k = NULL;
376376

377-
r = extract_first_word(&wants, &word, NULL, EXTRACT_QUOTES);
377+
r = extract_first_word(&wants, &word, NULL, EXTRACT_UNQUOTE);
378378
if (r == 0)
379379
break;
380380
if (r == -ENOMEM)
@@ -626,7 +626,7 @@ static int device_process_new(Manager *m, sd_device *dev) {
626626
for (;;) {
627627
_cleanup_free_ char *word = NULL;
628628

629-
r = extract_first_word(&alias, &word, NULL, EXTRACT_QUOTES);
629+
r = extract_first_word(&alias, &word, NULL, EXTRACT_UNQUOTE);
630630
if (r == 0)
631631
break;
632632
if (r == -ENOMEM)

‎src/core/load-fragment.c‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ int config_parse_unit_path_strv_printf(
334334
for (p = rvalue;;) {
335335
_cleanup_free_ char *word = NULL, *k = NULL;
336336

337-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
337+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
338338
if (r == 0)
339339
return 0;
340340
if (r == -ENOMEM)
@@ -638,7 +638,7 @@ int config_parse_exec(
638638

639639
semicolon = false;
640640

641-
r = extract_first_word_and_warn(&p, &firstword, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE, unit, filename, line, rvalue);
641+
r = extract_first_word_and_warn(&p, &firstword, NULL, EXTRACT_UNQUOTE|EXTRACT_CUNESCAPE, unit, filename, line, rvalue);
642642
if (r <= 0)
643643
return 0;
644644

@@ -784,7 +784,7 @@ int config_parse_exec(
784784
continue;
785785
}
786786

787-
r = extract_first_word_and_warn(&p, &word, NULL, EXTRACT_QUOTES|EXTRACT_CUNESCAPE, unit, filename, line, rvalue);
787+
r = extract_first_word_and_warn(&p, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_CUNESCAPE, unit, filename, line, rvalue);
788788
if (r == 0)
789789
break;
790790
if (r < 0)
@@ -2244,7 +2244,7 @@ int config_parse_environ(
22442244
for (p = rvalue;; ) {
22452245
_cleanup_free_ char *word = NULL, *k = NULL;
22462246

2247-
r = extract_first_word(&p, &word, NULL, EXTRACT_CUNESCAPE|EXTRACT_QUOTES);
2247+
r = extract_first_word(&p, &word, NULL, EXTRACT_CUNESCAPE|EXTRACT_UNQUOTE);
22482248
if (r == 0)
22492249
return 0;
22502250
if (r == -ENOMEM)
@@ -2312,7 +2312,7 @@ int config_parse_pass_environ(
23122312
for (;;) {
23132313
_cleanup_free_ char *word = NULL, *k = NULL;
23142314

2315-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
2315+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
23162316
if (r == 0)
23172317
break;
23182318
if (r == -ENOMEM)
@@ -2388,7 +2388,7 @@ int config_parse_unset_environ(
23882388
for (;;) {
23892389
_cleanup_free_ char *word = NULL, *k = NULL;
23902390

2391-
r = extract_first_word(&p, &word, NULL, EXTRACT_CUNESCAPE|EXTRACT_QUOTES);
2391+
r = extract_first_word(&p, &word, NULL, EXTRACT_CUNESCAPE|EXTRACT_UNQUOTE);
23922392
if (r == 0)
23932393
break;
23942394
if (r == -ENOMEM)
@@ -2463,7 +2463,7 @@ int config_parse_log_extra_fields(
24632463
struct iovec *t;
24642464
const char *eq;
24652465

2466-
r = extract_first_word(&p, &word, NULL, EXTRACT_CUNESCAPE|EXTRACT_QUOTES);
2466+
r = extract_first_word(&p, &word, NULL, EXTRACT_CUNESCAPE|EXTRACT_UNQUOTE);
24672467
if (r == 0)
24682468
return 0;
24692469
if (r == -ENOMEM)
@@ -2688,7 +2688,7 @@ int config_parse_unit_requires_mounts_for(
26882688
for (;;) {
26892689
_cleanup_free_ char *word = NULL, *resolved = NULL;
26902690

2691-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
2691+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
26922692
if (r == 0)
26932693
return 0;
26942694
if (r == -ENOMEM)
@@ -2883,7 +2883,7 @@ int config_parse_syscall_archs(
28832883
_cleanup_free_ char *word = NULL;
28842884
uint32_t a;
28852885

2886-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
2886+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
28872887
if (r == 0)
28882888
return 0;
28892889
if (r == -ENOMEM)
@@ -2987,7 +2987,7 @@ int config_parse_address_families(
29872987
_cleanup_free_ char *word = NULL;
29882988
int af;
29892989

2990-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
2990+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
29912991
if (r == 0)
29922992
return 0;
29932993
if (r == -ENOMEM)
@@ -3306,7 +3306,7 @@ int config_parse_delegate(
33063306
_cleanup_free_ char *word = NULL;
33073307
CGroupController cc;
33083308

3309-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
3309+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
33103310
if (r == 0)
33113311
break;
33123312
if (r == -ENOMEM)
@@ -3363,7 +3363,7 @@ int config_parse_device_allow(
33633363
return 0;
33643364
}
33653365

3366-
r = extract_first_word(&p, &path, NULL, EXTRACT_QUOTES);
3366+
r = extract_first_word(&p, &path, NULL, EXTRACT_UNQUOTE);
33673367
if (r == -ENOMEM)
33683368
return log_oom();
33693369
if (r < 0) {
@@ -3434,7 +3434,7 @@ int config_parse_io_device_weight(
34343434
return 0;
34353435
}
34363436

3437-
r = extract_first_word(&p, &path, NULL, EXTRACT_QUOTES);
3437+
r = extract_first_word(&p, &path, NULL, EXTRACT_UNQUOTE);
34383438
if (r == -ENOMEM)
34393439
return log_oom();
34403440
if (r < 0) {
@@ -3508,7 +3508,7 @@ int config_parse_io_device_latency(
35083508
return 0;
35093509
}
35103510

3511-
r = extract_first_word(&p, &path, NULL, EXTRACT_QUOTES);
3511+
r = extract_first_word(&p, &path, NULL, EXTRACT_UNQUOTE);
35123512
if (r == -ENOMEM)
35133513
return log_oom();
35143514
if (r < 0) {
@@ -3582,7 +3582,7 @@ int config_parse_io_limit(
35823582
return 0;
35833583
}
35843584

3585-
r = extract_first_word(&p, &path, NULL, EXTRACT_QUOTES);
3585+
r = extract_first_word(&p, &path, NULL, EXTRACT_UNQUOTE);
35863586
if (r == -ENOMEM)
35873587
return log_oom();
35883588
if (r < 0) {
@@ -3673,7 +3673,7 @@ int config_parse_blockio_device_weight(
36733673
return 0;
36743674
}
36753675

3676-
r = extract_first_word(&p, &path, NULL, EXTRACT_QUOTES);
3676+
r = extract_first_word(&p, &path, NULL, EXTRACT_UNQUOTE);
36773677
if (r == -ENOMEM)
36783678
return log_oom();
36793679
if (r < 0) {
@@ -3751,7 +3751,7 @@ int config_parse_blockio_bandwidth(
37513751
return 0;
37523752
}
37533753

3754-
r = extract_first_word(&p, &path, NULL, EXTRACT_QUOTES);
3754+
r = extract_first_word(&p, &path, NULL, EXTRACT_UNQUOTE);
37553755
if (r == -ENOMEM)
37563756
return log_oom();
37573757
if (r < 0) {
@@ -3871,7 +3871,7 @@ int config_parse_exec_directories(
38713871
for (p = rvalue;;) {
38723872
_cleanup_free_ char *word = NULL, *k = NULL;
38733873

3874-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
3874+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
38753875
if (r == -ENOMEM)
38763876
return log_oom();
38773877
if (r < 0) {
@@ -4007,7 +4007,7 @@ int config_parse_namespace_path_strv(
40074007
const char *w;
40084008
bool ignore_enoent = false, shall_prefix = false;
40094009

4010-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
4010+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
40114011
if (r == 0)
40124012
break;
40134013
if (r == -ENOMEM)
@@ -4085,7 +4085,7 @@ int config_parse_temporary_filesystems(
40854085
_cleanup_free_ char *word = NULL, *path = NULL, *resolved = NULL;
40864086
const char *w;
40874087

4088-
r = extract_first_word(&p, &word, NULL, EXTRACT_QUOTES);
4088+
r = extract_first_word(&p, &word, NULL, EXTRACT_UNQUOTE);
40894089
if (r == 0)
40904090
return 0;
40914091
if (r == -ENOMEM)
@@ -4161,7 +4161,7 @@ int config_parse_bind_paths(
41614161
char *s = NULL, *d = NULL;
41624162
bool rbind = true, ignore_enoent = false;
41634163

4164-
r = extract_first_word(&p, &source, ":" WHITESPACE, EXTRACT_QUOTES|EXTRACT_DONT_COALESCE_SEPARATORS);
4164+
r = extract_first_word(&p, &source, ":" WHITESPACE, EXTRACT_UNQUOTE|EXTRACT_DONT_COALESCE_SEPARATORS);
41654165
if (r == 0)
41664166
break;
41674167
if (r == -ENOMEM)
@@ -4190,7 +4190,7 @@ int config_parse_bind_paths(
41904190

41914191
/* Optionally, the destination is specified. */
41924192
if (p && p[-1] == ':') {
4193-
r = extract_first_word(&p, &destination, ":" WHITESPACE, EXTRACT_QUOTES|EXTRACT_DONT_COALESCE_SEPARATORS);
4193+
r = extract_first_word(&p, &destination, ":" WHITESPACE, EXTRACT_UNQUOTE|EXTRACT_DONT_COALESCE_SEPARATORS);
41944194
if (r == -ENOMEM)
41954195
return log_oom();
41964196
if (r < 0) {
@@ -4219,7 +4219,7 @@ int config_parse_bind_paths(
42194219
if (p && p[-1] == ':') {
42204220
_cleanup_free_ char *options = NULL;
42214221

4222-
r = extract_first_word(&p, &options, NULL, EXTRACT_QUOTES);
4222+
r = extract_first_word(&p, &options, NULL, EXTRACT_UNQUOTE);
42234223
if (r == -ENOMEM)
42244224
return log_oom();
42254225
if (r < 0) {

‎src/journal-remote/journal-remote-main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static int spawn_getter(const char *getter) {
123123
_cleanup_strv_free_ char **words = NULL;
124124

125125
assert(getter);
126-
r = strv_split_extract(&words, getter, WHITESPACE, EXTRACT_QUOTES);
126+
r = strv_split_extract(&words, getter, WHITESPACE, EXTRACT_UNQUOTE);
127127
if (r < 0)
128128
return log_error_errno(r, "Failed to split getter option: %m");
129129

‎src/locale/keymap-util.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ int x11_read_data(Context *c, sd_bus_message *m) {
252252
if (in_section && first_word(l, "Option")) {
253253
_cleanup_strv_free_ char **a = NULL;
254254

255-
r = strv_split_extract(&a, l, WHITESPACE, EXTRACT_QUOTES);
255+
r = strv_split_extract(&a, l, WHITESPACE, EXTRACT_UNQUOTE);
256256
if (r < 0)
257257
return r;
258258

@@ -276,7 +276,7 @@ int x11_read_data(Context *c, sd_bus_message *m) {
276276
} else if (!in_section && first_word(l, "Section")) {
277277
_cleanup_strv_free_ char **a = NULL;
278278

279-
r = strv_split_extract(&a, l, WHITESPACE, EXTRACT_QUOTES);
279+
r = strv_split_extract(&a, l, WHITESPACE, EXTRACT_UNQUOTE);
280280
if (r < 0)
281281
return -ENOMEM;
282282

@@ -491,7 +491,7 @@ static int read_next_mapping(const char* filename,
491491
if (IN_SET(l[0], 0, '#'))
492492
continue;
493493

494-
r = strv_split_extract(&b, l, WHITESPACE, EXTRACT_QUOTES);
494+
r = strv_split_extract(&b, l, WHITESPACE, EXTRACT_UNQUOTE);
495495
if (r < 0)
496496
return r;
497497

‎src/resolve/resolvconf-compat.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static int parse_search_domain(const char *string) {
8282
for (;;) {
8383
_cleanup_free_ char *word = NULL;
8484

85-
r = extract_first_word(&string, &word, NULL, EXTRACT_QUOTES);
85+
r = extract_first_word(&string, &word, NULL, EXTRACT_UNQUOTE);
8686
if (r < 0)
8787
return r;
8888
if (r == 0)

0 commit comments

Comments
 (0)
X Tutup