stop messing around with goto and just write the macro correctly.

beb3e4ce · Greg Stein · e6e0291e · beb3e4ce
Commit beb3e4ce authored Jul 16, 2000 by Greg Stein
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

Objects/unicodeobject.c Objects/unicodeobject.c +6 -7

No files found.
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -631,11 +631,12 @@ int utf8_decoding_error(const char **source,
    }
 }
-#define UTF8_ERROR(details)  do {                       \
+#define UTF8_ERROR(details) \
-    if (utf8_decoding_error(&s, &p, errors, details))   \
+  if (1) {                                                  \
+      if (utf8_decoding_error(&s, &p, errors, (details)))   \
          goto onError;                                     \
-    goto nextChar;                                      \
+      continue;                                             \
-} while (0)
+  } else
 PyObject *PyUnicode_DecodeUTF8(const char *s,
 			       int size,
@@ -731,8 +732,6 @@ PyObject *PyUnicode_DecodeUTF8(const char *s,
            UTF8_ERROR("unsupported Unicode code range");
        }
        s += n;
-nextChar:
-	/* empty */;
    }
    /* Adjust length */