summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-04-22 11:40:03 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2006-04-22 11:40:03 (GMT)
commit6685128b973981ff57b577f09b0a38e0071d272e (patch)
treec4d5536244f91e6c818b2ceb6335c56386156629 /Objects
parent26fd9607c729f4dbe322967464834a2bce18c07d (diff)
downloadcpython-6685128b973981ff57b577f09b0a38e0071d272e.zip
cpython-6685128b973981ff57b577f09b0a38e0071d272e.tar.gz
cpython-6685128b973981ff57b577f09b0a38e0071d272e.tar.bz2
Fix more ssize_t issues.
Diffstat (limited to 'Objects')
-rw-r--r--Objects/classobject.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c
index a723bd6..a1907f5 100644
--- a/Objects/classobject.c
+++ b/Objects/classobject.c
@@ -320,7 +320,7 @@ class_setattr(PyClassObject *op, PyObject *name, PyObject *v)
}
sname = PyString_AsString(name);
if (sname[0] == '_' && sname[1] == '_') {
- int n = PyString_Size(name);
+ Py_ssize_t n = PyString_Size(name);
if (sname[n-1] == '_' && sname[n-2] == '_') {
char *err = NULL;
if (strcmp(sname, "__dict__") == 0)
@@ -380,7 +380,7 @@ class_str(PyClassObject *op)
PyObject *mod = PyDict_GetItemString(op->cl_dict, "__module__");
PyObject *name = op->cl_name;
PyObject *res;
- int m, n;
+ Py_ssize_t m, n;
if (name == NULL || !PyString_Check(name))
return class_repr(op);
@@ -638,7 +638,7 @@ instance_dealloc(register PyInstanceObject *inst)
PyObject_GC_Del(inst);
}
else {
- int refcnt = inst->ob_refcnt;
+ Py_ssize_t refcnt = inst->ob_refcnt;
/* __del__ resurrected it! Make it look like the original
* Py_DECREF never happened.
*/
@@ -778,7 +778,7 @@ instance_setattr(PyInstanceObject *inst, PyObject *name, PyObject *v)
PyObject *func, *args, *res, *tmp;
char *sname = PyString_AsString(name);
if (sname[0] == '_' && sname[1] == '_') {
- int n = PyString_Size(name);
+ Py_ssize_t n = PyString_Size(name);
if (sname[n-1] == '_' && sname[n-2] == '_') {
if (strcmp(sname, "__dict__") == 0) {
if (PyEval_GetRestricted()) {
@@ -1263,7 +1263,7 @@ instance_contains(PyInstanceObject *inst, PyObject *member)
*/
PyErr_Clear();
return _PySequence_IterSearch((PyObject *)inst, member,
- PY_ITERSEARCH_CONTAINS);
+ PY_ITERSEARCH_CONTAINS) > 0;
}
else
return -1;