From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 25 Aug 2007 17:08:59 +0000 (+0000)
Subject: Get rid of compiler warning on 64-bit
X-Git-Tag: v3.0a1~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ef6a57908ec5dca73351ab756d43e7b58b65609;p=thirdparty%2FPython%2Fcpython.git

Get rid of compiler warning on 64-bit
---

diff --git a/Objects/stringlib/string_format.h b/Objects/stringlib/string_format.h
index 58032165d34e..b81a7e384a3d 100644
--- a/Objects/stringlib/string_format.h
+++ b/Objects/stringlib/string_format.h
@@ -621,10 +621,14 @@ MarkupIterator_next(MarkupIterator *self, int *is_markup, SubString *literal,
         at_end = self->str.ptr >= self->str.end;
         len = self->str.ptr - start;
 
-        if ((c == '}') && (at_end || (c != *self->str.ptr)))
-            return (int)SetError("Single } encountered");
-        if (at_end && c == '{')
-            return (int)SetError("Single { encountered");
+        if ((c == '}') && (at_end || (c != *self->str.ptr))) {
+            SetError("Single } encountered");
+            return 0;
+        }
+        if (at_end && c == '{') {
+            SetError("Single { encountered");
+            return 0;
+        }
         if (!at_end) {
             if (c == *self->str.ptr) {
                 /* escaped } or {, skip it in the input */