[Python-3000-checkins] r57470 - python/branches/py3k/Objects/stringlib/string_format.h

neal.norwitz python-3000-checkins at python.org
Sat Aug 25 19:08:59 CEST 2007


Author: neal.norwitz
Date: Sat Aug 25 19:08:59 2007
New Revision: 57470

Modified:
   python/branches/py3k/Objects/stringlib/string_format.h
Log:
Get rid of compiler warning on 64-bit

Modified: python/branches/py3k/Objects/stringlib/string_format.h
==============================================================================
--- python/branches/py3k/Objects/stringlib/string_format.h	(original)
+++ python/branches/py3k/Objects/stringlib/string_format.h	Sat Aug 25 19:08:59 2007
@@ -621,10 +621,14 @@
         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 */


More information about the Python-3000-checkins mailing list