[Python-checkins] r75939 - in python/trunk/Modules/_io: _iomodule.h bufferedio.c

[mark.dickinson]

Author: mark.dickinson
Date: Thu Oct 29 10:46:04 2009
New Revision: 75939

Log:
Roll back ill-considered attempts to fix printf specifier mismatch for off_t.
The sensible solution seems to be to implement %lld for PyString_FromFormat(V)
and PyErr_Format.  See issue #7228.



Modified:
   python/trunk/Modules/_io/_iomodule.h
   python/trunk/Modules/_io/bufferedio.c

Modified: python/trunk/Modules/_io/_iomodule.h
==============================================================================
--- python/trunk/Modules/_io/_iomodule.h	(original)
+++ python/trunk/Modules/_io/_iomodule.h	Thu Oct 29 10:46:04 2009
@@ -75,14 +75,6 @@
  * Offset type for positioning.
  */
 
-/* Printing a variable of type off_t correctly and without producing
-   compiler warnings is surprisingly painful.  We identify an integer
-   type whose size matches off_t and then: (1) cast the off_t to that
-   integer type and (2) use the appropriate conversion specification
-   for printf.  The cast is necessary: gcc complains about formatting
-   a long with "%lld" even when both long and long long have the same
-   precision. */
-
 #if defined(MS_WIN64) || defined(MS_WINDOWS)
 
 /* Windows uses long long for offsets */
@@ -91,33 +83,26 @@
 # define PyLong_FromOff_t   PyLong_FromLongLong
 # define PY_OFF_T_MAX       PY_LLONG_MAX
 # define PY_OFF_T_MIN       PY_LLONG_MIN
-# define PY_PRIdOFF         "I64d" /* format to use in printf with type off_t */
-# define PY_OFF_T_COMPAT    PY_LONG_LONG /* type compatible with off_t */
+
 #else
 
 /* Other platforms use off_t */
 typedef off_t Py_off_t;
-#if (HAVE_LONG_LONG && SIZEOF_OFF_T == SIZEOF_LONG_LONG)
+#if (SIZEOF_OFF_T == SIZEOF_SIZE_T)
+# define PyLong_AsOff_t     PyLong_AsSsize_t
+# define PyLong_FromOff_t   PyLong_FromSsize_t
+# define PY_OFF_T_MAX       PY_SSIZE_T_MAX
+# define PY_OFF_T_MIN       PY_SSIZE_T_MIN
+#elif (SIZEOF_OFF_T == SIZEOF_LONG_LONG)
 # define PyLong_AsOff_t     PyLong_AsLongLong
 # define PyLong_FromOff_t   PyLong_FromLongLong
 # define PY_OFF_T_MAX       PY_LLONG_MAX
 # define PY_OFF_T_MIN       PY_LLONG_MIN
-# define PY_PRIdOFF         "lld"
-# define PY_OFF_T_COMPAT    PY_LONG_LONG
 #elif (SIZEOF_OFF_T == SIZEOF_LONG)
 # define PyLong_AsOff_t     PyLong_AsLong
 # define PyLong_FromOff_t   PyLong_FromLong
 # define PY_OFF_T_MAX       LONG_MAX
 # define PY_OFF_T_MIN       LONG_MIN
-# define PY_PRIdOFF         "ld"
-# define PY_OFF_T_COMPAT    long
-#elif (SIZEOF_OFF_T == SIZEOF_SIZE_T)
-# define PyLong_AsOff_t     PyLong_AsSsize_t
-# define PyLong_FromOff_t   PyLong_FromSsize_t
-# define PY_OFF_T_MAX       PY_SSIZE_T_MAX
-# define PY_OFF_T_MIN       PY_SSIZE_T_MIN
-# define PY_PRIdOFF         "zd"
-# define PY_OFF_T_COMPAT    Py_ssize_t
 #else
 # error off_t does not match either size_t, long, or long long!
 #endif

Modified: python/trunk/Modules/_io/bufferedio.c
==============================================================================
--- python/trunk/Modules/_io/bufferedio.c	(original)
+++ python/trunk/Modules/_io/bufferedio.c	Thu Oct 29 10:46:04 2009
@@ -580,8 +580,7 @@
     if (n < 0) {
         if (!PyErr_Occurred())
             PyErr_Format(PyExc_IOError,
-                         "Raw stream returned invalid position %" PY_PRIdOFF,
-			 (PY_OFF_T_COMPAT)n);
+                         "Raw stream returned invalid position %zd", n);
         return -1;
     }
     self->abs_pos = n;
@@ -613,8 +612,7 @@
     if (n < 0) {
         if (!PyErr_Occurred())
             PyErr_Format(PyExc_IOError,
-                         "Raw stream returned invalid position %" PY_PRIdOFF,
-			 (PY_OFF_T_COMPAT)n);
+                         "Raw stream returned invalid position %zd", n);
         return -1;
     }
     self->abs_pos = n;