Mercurial > cpython-lru_cache-weakref

diff Objects/unicodeobject.c @ 17640:9934225fe297 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A different approach to the problem reported in Patch #419651: Metrowerks on Mac adds 0x itself C std says %#x and %#X conversion of 0 do not add the 0x/0X base marker. Metrowerks apparently does. Mark Favas reported the same bug under a Compaq compiler on Tru64 Unix, but no other libc broken in this respect is known (known to be OK under MSVC and gcc). So just try the damn thing at runtime and see what the platform does. Note that we've always had bugs here, but never knew it before because a relevant test case didn't exist before 2.1.
author Tim Peters <tim.peters@gmail.com>
date Sat, 28 Apr 2001 05:38:26 +0000
parents b44ba7c01217
children 9e093bf8f6a9
line wrap: on
line diff
--- a/Objects/unicodeobject.c	Fri Apr 27 21:35:01 2001 +0000
+++ b/Objects/unicodeobject.c	Sat Apr 28 05:38:26 2001 +0000
@@ -4737,6 +4737,7 @@
        + 1 + 1 = 24*/
     char fmt[64]; /* plenty big enough! */
     long x;
+    int use_native_c_format = 1;
 
     x = PyInt_AsLong(v);
     if (x == -1 && PyErr_Occurred())
@@ -4753,11 +4754,21 @@
     /* When converting 0 under %#x or %#X, C leaves off the base marker,
      * but we want it (for consistency with other %#x conversions, and
      * for consistency with Python's hex() function).
+     * BUG 28-Apr-2001 tim:  At least two platform Cs (Metrowerks &
+     * Compaq Tru64) violate the std by converting 0 w/ leading 0x anyway.
+     * So add it only if the platform doesn't already.
      */
-    if (x == 0 && (flags & F_ALT) && (type == 'x' || type == 'X'))
-        sprintf(fmt, "0%c%%%s.%dl%c", type, "#", prec, type);
-    else
-        sprintf(fmt, "%%%s.%dl%c", (flags & F_ALT) ? "#" : "", prec, type);
+    if (x == 0 && (flags & F_ALT) && (type == 'x' || type == 'X')) {
+        /* Only way to know what the platform does is to try it. */
+        sprintf(fmt, type == 'x' ? "%#x" : "%#X", 0);
+        if (fmt[1] != (char)type) {
+            /* Supply our own leading 0x/0X -- needed under std C */
+            use_native_c_format = 0;
+            sprintf(fmt, "0%c%%#.%dl%c", type, prec, type);
+        }
+    }
+    if (use_native_c_format)
+         sprintf(fmt, "%%%s.%dl%c", (flags & F_ALT) ? "#" : "", prec, type);
     return usprintf(buf, fmt, x);
 }