[Python-checkins] r67135 - in sandbox/trunk/io-c: _bytesio.c _iobase.c io.c

[alexandre.vassalotti]

Author: alexandre.vassalotti
Date: Fri Nov  7 03:16:54 2008
New Revision: 67135

Log:
Fix compiler errors and warnings.


Modified:
   sandbox/trunk/io-c/_bytesio.c
   sandbox/trunk/io-c/_iobase.c
   sandbox/trunk/io-c/io.c

Modified: sandbox/trunk/io-c/_bytesio.c
==============================================================================
--- sandbox/trunk/io-c/_bytesio.c	(original)
+++ sandbox/trunk/io-c/_bytesio.c	Fri Nov  7 03:16:54 2008
@@ -1,4 +1,5 @@
 #include "Python.h"
+#include "structmember.h"       /* for offsetof() */
 
 typedef struct {
     PyObject_HEAD

Modified: sandbox/trunk/io-c/_iobase.c
==============================================================================
--- sandbox/trunk/io-c/_iobase.c	(original)
+++ sandbox/trunk/io-c/_iobase.c	Fri Nov  7 03:16:54 2008
@@ -516,23 +516,23 @@
 }
 
 static PyMethodDef IOBase_methods[] = {
-    {"seek", IOBase_seek, METH_VARARGS},
-    {"tell", IOBase_tell, METH_NOARGS},
-    {"truncate", IOBase_truncate, METH_VARARGS},
-    {"flush", IOBase_flush, METH_NOARGS},
-    {"close", IOBase_close, METH_NOARGS},
-
-    {"seekable", IOBase_seekable, METH_NOARGS},
-    {"readable", IOBase_readable, METH_NOARGS},
-    {"writable", IOBase_writable, METH_NOARGS},
+    {"seek", IOBase_seek, METH_VARARGS, IOBase_seek_doc},
+    {"tell", IOBase_tell, METH_NOARGS, IOBase_tell_doc},
+    {"truncate", IOBase_truncate, METH_VARARGS, IOBase_truncate_doc},
+    {"flush", IOBase_flush, METH_NOARGS, IOBase_flush_doc},
+    {"close", IOBase_close, METH_NOARGS, IOBase_close_doc},
+
+    {"seekable", IOBase_seekable, METH_NOARGS, IOBase_seekable_doc},
+    {"readable", IOBase_readable, METH_NOARGS, IOBase_readable_doc},
+    {"writable", IOBase_writable, METH_NOARGS, IOBase_writable_doc},
 
     {"_checkClosed",   _PyIOBase_checkClosed, METH_NOARGS},
     {"_checkSeekable", _PyIOBase_checkSeekable, METH_NOARGS},
     {"_checkReadable", _PyIOBase_checkReadable, METH_NOARGS},
     {"_checkWritable", _PyIOBase_checkWritable, METH_NOARGS},
 
-    {"fileno", IOBase_fileno, METH_NOARGS},
-    {"isatty", IOBase_isatty, METH_NOARGS},
+    {"fileno", IOBase_fileno, METH_NOARGS, IOBase_fileno_doc},
+    {"isatty", IOBase_isatty, METH_NOARGS, IOBase_isatty_doc},
 
     {"__enter__", IOBase_enter, METH_NOARGS},
     {"__exit__", IOBase_exit, METH_VARARGS},
@@ -540,9 +540,9 @@
     {"__iter__", IOBase_iter, METH_NOARGS},
     {"__next__", IOBase_next, METH_NOARGS},
 
-    {"readline", IOBase_readline, METH_VARARGS},
-    {"readlines", IOBase_readlines, METH_VARARGS},
-    {"writelines", IOBase_readlines, METH_VARARGS},
+    {"readline", IOBase_readline, METH_VARARGS, IOBase_readline_doc},
+    {"readlines", IOBase_readlines, METH_VARARGS, IOBase_readlines_doc},
+    {"writelines", IOBase_writelines, METH_VARARGS},
 
     {NULL, NULL}
 };

Modified: sandbox/trunk/io-c/io.c
==============================================================================
--- sandbox/trunk/io-c/io.c	(original)
+++ sandbox/trunk/io-c/io.c	Fri Nov  7 03:16:54 2008
@@ -1,4 +1,4 @@
-#include <python.h>
+#include "Python.h"
 #include "structmember.h"
 #include "_iomodule.h"
 
@@ -410,8 +410,8 @@
             if (fileno == -1 && PyErr_Occurred())
                 goto error;
 
-            if (stat(fileno, &st) >= 0)
-                buffering = st->st_blksize;
+            if (fstat(fileno, &st) >= 0)
+                buffering = st.st_blksize;
         }
 #endif
     }