picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

util: fix FOREACH_WORD macro definitions

Browse source
This commit is contained in:
Lennart Poettering 2010-02-14 01:07:36 +01:00
parent c85dc17be7
commit f62c0e4f30
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
load-fragment.c
View file

@ -56,7 +56,7 @@ static int config_parse_deps(
assert(lvalue);
assert(rvalue);
FOREACH_WORD(w, &l, rvalue, state) {
FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
@ -92,7 +92,7 @@ static int config_parse_names(
assert(rvalue);
assert(data);
FOREACH_WORD(w, &l, rvalue, state) {
FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
Unit *other;
@ -746,7 +746,7 @@ static int config_parse_cpu_affinity(
assert(rvalue);
assert(data);
FOREACH_WORD(w, &l, rvalue, state) {
FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
unsigned cpu;
@ -821,7 +821,7 @@ static int config_parse_secure_bits(
assert(rvalue);
assert(data);
FOREACH_WORD(w, &l, rvalue, state) {
FOREACH_WORD(w, l, rvalue, state) {
if (first_word(w, "keep-caps"))
c->secure_bits |= SECURE_KEEP_CAPS;
else if (first_word(w, "keep-caps-locked"))
@ -862,7 +862,7 @@ static int config_parse_bounding_set(
assert(rvalue);
assert(data);
FOREACH_WORD(w, &l, rvalue, state) {
FOREACH_WORD(w, l, rvalue, state) {
char *t;
int r;
cap_value_t cap;

6
util.h
View file

@ -99,13 +99,13 @@ char *split(const char *c, size_t *l, const char *separator, char **state);
char *split_quoted(const char *c, size_t *l, char **state);
#define FOREACH_WORD(word, length, s, state) \
for ((state) = NULL, (word) = split((s), &(l), WHITESPACE, &(state)); (word); (word) = split((s), &(l), WHITESPACE, &(state)))
for ((state) = NULL, (word) = split((s), &(length), WHITESPACE, &(state)); (word); (word) = split((s), &(length), WHITESPACE, &(state)))
#define FOREACH_WORD_SEPARATOR(word, length, s, separator, state) \
for ((state) = NULL, (word) = split((s), &(l), (separator), &(state)); (word); (word) = split((s), &(l), (separator), &(state)))
for ((state) = NULL, (word) = split((s), &(length), (separator), &(state)); (word); (word) = split((s), &(length), (separator), &(state)))
#define FOREACH_WORD_QUOTED(word, length, s, state) \
for ((state) = NULL, (word) = split_quoted((s), &(l), &(state)); (word); (word) = split_quoted((s), &(l), &(state)))
for ((state) = NULL, (word) = split_quoted((s), &(length), &(state)); (word); (word) = split_quoted((s), &(length), &(state)))
char **split_path_and_make_absolute(const char *p);