From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 11 Nov 2016 17:58:41 +0000 (-0500)
Subject: tree-wide: make invocations of extract_first_word more uniform (#4627)
X-Git-Tag: v233.3~161
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=95d379d7f7191323ff53adb0a7861edc231b2442

tree-wide: make invocations of extract_first_word more uniform (#4627)

extract_first_words deals fine with the string being NULL, so drop the upfront
check for that.
---

diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c
index bace3c183..609f5dc22 100644
--- a/src/basic/extract-word.c
+++ b/src/basic/extract-word.c
@@ -48,7 +48,7 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra
 
         /* Bail early if called after last value or with no input */
         if (!*p)
-                goto finish_force_terminate;
+                goto finish;
         c = **p;
 
         if (!separators)