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

[mark.dickinson]

Author: mark.dickinson
Date: Mon Oct 26 20:59:23 2009
New Revision: 75728

Log:
Use correct conversion specifier and length modifier when printing an
integer of type off_t.  Also, don't assume that long long is available.


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	Mon Oct 26 20:59:23 2009
@@ -83,26 +83,30 @@
 # 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" /* format to use in printf with type off_t */
 
 #else
 
 /* Other platforms use off_t */
 typedef off_t Py_off_t;
-#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)
+#if (HAVE_LONG_LONG && 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"
 #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"
+#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"
 #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	Mon Oct 26 20:59:23 2009
@@ -580,7 +580,8 @@
     if (n < 0) {
         if (!PyErr_Occurred())
             PyErr_Format(PyExc_IOError,
-                         "Raw stream returned invalid position %zd", n);
+                         "Raw stream returned invalid position %" PY_PRIdOFF,
+			 n);
         return -1;
     }
     self->abs_pos = n;
@@ -612,7 +613,8 @@
     if (n < 0) {
         if (!PyErr_Occurred())
             PyErr_Format(PyExc_IOError,
-                         "Raw stream returned invalid position %zd", n);
+                         "Raw stream returned invalid position %" PY_PRIdOFF,
+			 n);
         return -1;
     }
     self->abs_pos = n;