summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2008-09-12 16:18:25 -0400
committerEamon Walsh <ewalsh@tycho.nsa.gov>2008-09-12 16:18:25 -0400
commitdff52adc8b29e60674e83d67fea524db3eff9df8 (patch)
tree559aac44b55267e0ccd7a9cceac312be105f6a13
parent0da3700a6ee398143a19a8b6c593f6f26c15044e (diff)
Use correct conversion specifier for Py_ssize_t arguments.
Fixes x86_64 builds.
-rw-r--r--src/iter.c2
-rw-r--r--src/list.c8
-rw-r--r--src/module.c2
-rw-r--r--src/protobj.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/iter.c b/src/iter.c
index f5c4689..5368f24 100644
--- a/src/iter.c
+++ b/src/iter.c
@@ -74,7 +74,7 @@ xpybIter_init(xpybIter *self, PyObject *args, PyObject *kw)
PyObject *name, *list, *bool;
Py_ssize_t groupsize;
- if (!PyArg_ParseTuple(args, "OiSO", &list, &groupsize, &name, &bool))
+ if (!PyArg_ParseTuple(args, "OnSO", &list, &groupsize, &name, &bool))
return -1;
Py_INCREF(self->name = name);
diff --git a/src/list.c b/src/list.c
index b9bfda7..c4c8367 100644
--- a/src/list.c
+++ b/src/list.c
@@ -56,7 +56,7 @@ xpybList_init(xpybList *self, PyObject *args, PyObject *kw)
PyObject *parent, *type, *obj, *arglist;
const char *data;
- if (!PyArg_ParseTupleAndKeywords(args, kw, "OiiO|i", kwlist, &parent,
+ if (!PyArg_ParseTupleAndKeywords(args, kw, "OnnO|n", kwlist, &parent,
&offset, &length, &type, &size))
return -1;
@@ -66,7 +66,7 @@ xpybList_init(xpybList *self, PyObject *args, PyObject *kw)
if (PyObject_AsReadBuffer(parent, (const void **)&data, &datalen) < 0)
return -1;
- if (length * size - offset > datalen) {
+ if (length * size + offset > datalen) {
PyErr_SetString(xpybExcept_base, "Protocol object buffer too short.");
return -1;
}
@@ -80,14 +80,14 @@ xpybList_init(xpybList *self, PyObject *args, PyObject *kw)
return -1;
cur += size;
} else if (size > 0) {
- arglist = Py_BuildValue("(Oii)", parent, cur, size);
+ arglist = Py_BuildValue("(Onn)", parent, cur, size);
obj = PyEval_CallObject(type, arglist);
Py_DECREF(arglist);
if (obj == NULL)
return -1;
cur += size;
} else {
- arglist = Py_BuildValue("(Oi)", parent, cur);
+ arglist = Py_BuildValue("(On)", parent, cur);
obj = PyEval_CallObject(type, arglist);
Py_DECREF(arglist);
if (obj == NULL)
diff --git a/src/module.c b/src/module.c
index a8c10a8..4f822b1 100644
--- a/src/module.c
+++ b/src/module.c
@@ -173,7 +173,7 @@ xpyb_resize_obj(PyObject *self, PyObject *args)
Py_ssize_t size;
PyObject *buf;
- if (!PyArg_ParseTuple(args, "O!i", &xpybProtobj_type, &obj, &size))
+ if (!PyArg_ParseTuple(args, "O!n", &xpybProtobj_type, &obj, &size))
return NULL;
buf = PyBuffer_FromObject(obj->buf, 0, size);
diff --git a/src/protobj.c b/src/protobj.c
index ff4213c..a4bbfb9 100644
--- a/src/protobj.c
+++ b/src/protobj.c
@@ -20,7 +20,7 @@ xpybProtobj_init(xpybProtobj *self, PyObject *args, PyObject *kw)
Py_ssize_t offset = 0, size = Py_END_OF_BUFFER;
PyObject *parent;
- if (!PyArg_ParseTupleAndKeywords(args, kw, "O|ii", kwlist,
+ if (!PyArg_ParseTupleAndKeywords(args, kw, "O|nn", kwlist,
&parent, &offset, &size))
return -1;