diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2015-08-31 04:40:44 +0200 |
|---|---|---|
| committer | Filipe Brandenburger <filbranden@google.com> | 2015-08-31 04:48:38 +0200 |
| commit | 8ab00959fb9758510c7b88bb1e8cf03162361e15 (patch) | |
| tree | ac21d0c56cd6ab7141d9b3ecbc397a5c62544222 /src/basic | |
| parent | extract_first_word: Refactor allocation in empty argument case (diff) | |
| download | systemd-8ab00959fb9758510c7b88bb1e8cf03162361e15.tar.xz systemd-8ab00959fb9758510c7b88bb1e8cf03162361e15.zip | |
extract_first_word: Refactor EXTRACT_DONT_COALESCE_SEPARATORS handling
Refactor allocation of the result string to the top, since it is
currently done in both branches of the condition.
Remove unreachable code checking for EXTRACT_DONT_COALESCE_SEPARATORS
when state == SEPARATOR (the only place where SEPARATOR is assigned to
state follows a check for EXTRACT_DONT_COALESCE_SEPARATORS that jumps to
the end of the function.)
Tested by running test-util successfully.
Follow up to: 206644aedeb8859801051ac170ec562c6a113a79
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/util.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/basic/util.c b/src/basic/util.c index fc0f000848..a9071aa117 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -5754,15 +5754,14 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra switch (state) { case START: - if (c == 0) { - if (flags & EXTRACT_DONT_COALESCE_SEPARATORS) - if (!GREEDY_REALLOC(s, allocated, sz+1)) - return -ENOMEM; + if (flags & EXTRACT_DONT_COALESCE_SEPARATORS) + if (!GREEDY_REALLOC(s, allocated, sz+1)) + return -ENOMEM; + + if (c == 0) goto finish_force_terminate; - } else if (strchr(separators, c)) { + else if (strchr(separators, c)) { if (flags & EXTRACT_DONT_COALESCE_SEPARATORS) { - if (!GREEDY_REALLOC(s, allocated, sz+1)) - return -ENOMEM; (*p) ++; goto finish_force_next; } @@ -5891,8 +5890,6 @@ end_escape: case SEPARATOR: if (c == 0) goto finish_force_terminate; - if (flags & EXTRACT_DONT_COALESCE_SEPARATORS) - goto finish_force_next; if (!strchr(separators, c)) goto finish; break; |