[Python-checkins] r43078 - python/trunk/Python/modsupport.c
neal.norwitz
python-checkins at python.org
Thu Mar 16 09:20:24 CET 2006
Author: neal.norwitz
Date: Thu Mar 16 09:20:19 2006
New Revision: 43078
Modified:
python/trunk/Python/modsupport.c
Log:
Make mktuple consistent with mklist to get rid of Coverity warnings. Also use macro version of SetItem since we know everything is setup.
Modified: python/trunk/Python/modsupport.c
==============================================================================
--- python/trunk/Python/modsupport.c (original)
+++ python/trunk/Python/modsupport.c Thu Mar 16 09:20:19 2006
@@ -218,7 +218,7 @@
Py_INCREF(Py_None);
w = Py_None;
}
- PyList_SetItem(v, i, w);
+ PyList_SET_ITEM(v, i, w);
}
if (itemfailed) {
@@ -232,7 +232,6 @@
"Unmatched paren in format");
return NULL;
}
-
if (endchar)
++*p_format;
return v;
@@ -268,20 +267,21 @@
Py_INCREF(Py_None);
w = Py_None;
}
- PyTuple_SetItem(v, i, w);
+ PyTuple_SET_ITEM(v, i, w);
+ }
+ if (itemfailed) {
+ /* do_mkvalue() should have already set an error */
+ Py_DECREF(v);
+ return NULL;
}
- if (v != NULL && **p_format != endchar) {
+ if (**p_format != endchar) {
Py_DECREF(v);
- v = NULL;
PyErr_SetString(PyExc_SystemError,
"Unmatched paren in format");
+ return NULL;
}
- else if (endchar)
+ if (endchar)
++*p_format;
- if (itemfailed) {
- Py_DECREF(v);
- v = NULL;
- }
return v;
}
More information about the Python-checkins
mailing list