mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-28 12:31:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor bit of factoring-out common code.

Browse Source
This commit is contained in:
Raymond Hettinger 2015-07-06 19:08:49 -07:00
parent 3dbc11cadd
commit 11ce8e6c37
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Objects/setobject.c
View File

@ -1271,26 +1271,14 @@ set_intersection(PySetObject *so, PyObject *other)
while ((key = PyIter_Next(it)) != NULL) {
hash = PyObject_Hash(key);
if (hash == -1) {
Py_DECREF(it);
Py_DECREF(result);
Py_DECREF(key);
return NULL;
}
if (hash == -1)
goto error;
rv = set_contains_entry(so, key, hash);
if (rv < 0) {
Py_DECREF(it);
Py_DECREF(result);
Py_DECREF(key);
return NULL;
}
if (rv < 0)
goto error;
if (rv) {
if (set_add_entry(result, key, hash)) {
Py_DECREF(it);
Py_DECREF(result);
Py_DECREF(key);
return NULL;
}
if (set_add_entry(result, key, hash))
goto error;
}
Py_DECREF(key);
}
@ -1300,6 +1288,11 @@ set_intersection(PySetObject *so, PyObject *other)
return NULL;
}
return (PyObject *)result;
error:
Py_DECREF(it);
Py_DECREF(result);
Py_DECREF(key);
return NULL;
}
static PyObject *