[Python-checkins] r43539 - python/trunk/Modules/_sqlite/connection.c python/trunk/Modules/_sqlite/cursor.c python/trunk/Modules/_sqlite/row.c python/trunk/Modules/_sqlite/statement.c

[neal.norwitz]

Author: neal.norwitz
Date: Sat Apr  1 11:08:06 2006
New Revision: 43539

Modified:
   python/trunk/Modules/_sqlite/connection.c
   python/trunk/Modules/_sqlite/cursor.c
   python/trunk/Modules/_sqlite/row.c
   python/trunk/Modules/_sqlite/statement.c
Log:
Make ssize_t clean

Modified: python/trunk/Modules/_sqlite/connection.c
==============================================================================
--- python/trunk/Modules/_sqlite/connection.c	(original)
+++ python/trunk/Modules/_sqlite/connection.c	Sat Apr  1 11:08:06 2006
@@ -377,7 +377,7 @@
 {
     long longval;
     const char* buffer;
-    int buflen;
+    Py_ssize_t buflen;
     PyObject* stringval;
 
     if (PyErr_Occurred()) {
@@ -416,7 +416,7 @@
     PyObject* cur_py_value;
     const char* val_str;
     PY_LONG_LONG val_int;
-    int buflen;
+    Py_ssize_t buflen;
     void* raw_buffer;
 
     args = PyTuple_New(argc);

Modified: python/trunk/Modules/_sqlite/cursor.c
==============================================================================
--- python/trunk/Modules/_sqlite/cursor.c	(original)
+++ python/trunk/Modules/_sqlite/cursor.c	Sat Apr  1 11:08:06 2006
@@ -239,7 +239,7 @@
     PY_LONG_LONG intval;
     PyObject* converter;
     PyObject* converted;
-    int nbytes;
+    Py_ssize_t nbytes;
     PyObject* buffer;
     void* raw_buffer;
     const char* val_str;

Modified: python/trunk/Modules/_sqlite/row.c
==============================================================================
--- python/trunk/Modules/_sqlite/row.c	(original)
+++ python/trunk/Modules/_sqlite/row.c	Sat Apr  1 11:08:06 2006
@@ -126,7 +126,7 @@
     }
 }
 
-int row_length(Row* self, PyObject* args, PyObject* kwargs)
+Py_ssize_t row_length(Row* self, PyObject* args, PyObject* kwargs)
 {
     return PyTuple_GET_SIZE(self->data);
 }
@@ -138,7 +138,7 @@
 
 
 PyMappingMethods row_as_mapping = {
-    /* mp_length        */ (inquiry)row_length,
+    /* mp_length        */ (lenfunc)row_length,
     /* mp_subscript     */ (binaryfunc)row_subscript,
     /* mp_ass_subscript */ (objobjargproc)0,
 };

Modified: python/trunk/Modules/_sqlite/statement.c
==============================================================================
--- python/trunk/Modules/_sqlite/statement.c	(original)
+++ python/trunk/Modules/_sqlite/statement.c	Sat Apr  1 11:08:06 2006
@@ -94,7 +94,7 @@
 #endif
     const char* buffer;
     char* string;
-    int buflen;
+    Py_ssize_t buflen;
     PyObject* stringval;
 
     if (parameter == Py_None) {