From: Filipe Brandenburger <filbranden@google.com>
Date: Fri, 6 Nov 2015 05:17:11 +0000 (-0800)
Subject: extract-word: replace an use of `goto` with structured code
X-Git-Tag: v228~67^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ff13c298d6d53293680c383768c3054fb9fcc30;p=thirdparty%2Fsystemd.git

extract-word: replace an use of `goto` with structured code

Using `goto` might be appropriate for the "finish" cases but it was
really not necessary at this point of the code... Just use if/else
blocks to accomplish the same.

Confirmed that the test cases in test-extract-word keep working as
expected.
---

diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c
index 23e3d557c03..1b3123bb7d8 100644
--- a/src/basic/extract-word.c
+++ b/src/basic/extract-word.c
@@ -106,21 +106,19 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra
                                         if (flags & EXTRACT_CUNESCAPE_RELAX) {
                                                 s[sz++] = '\\';
                                                 s[sz++] = c;
-                                                goto end_escape;
-                                        }
-                                        return -EINVAL;
+                                        } else
+                                                return -EINVAL;
+                                } else {
+                                        (*p) += r - 1;
+
+                                        if (c != 0)
+                                                s[sz++] = c; /* normal explicit char */
+                                        else
+                                                sz += utf8_encode_unichar(s + sz, u); /* unicode chars we'll encode as utf8 */
                                 }
-
-                                (*p) += r - 1;
-
-                                if (c != 0)
-                                        s[sz++] = c; /* normal explicit char */
-                                else
-                                        sz += utf8_encode_unichar(s + sz, u); /* unicode chars we'll encode as utf8 */
                         } else
                                 s[sz++] = c;
 
-end_escape:
                         backslash = false;
 
                 } else if (quote) {     /* inside either single or double quotes */