Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

The contains function raised a gcc warning. The new code is copied straight from py3k.

This commit is contained in:
Christian Heimes 2008-02-26 08:18:11 +00:00
parent 75992edfae
commit aa0ef52ea1
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Modules/gdbmmodule.c
View File

@ -179,16 +179,23 @@ dbm_ass_sub(dbmobject *dp, PyObject *v, PyObject *w)
}
static int
dbm_contains(register dbmobject *dp, PyObject *v)
dbm_contains(register dbmobject *dp, PyObject *arg)
{
datum key;
if (PyString_AsStringAndSize(v, &key.dptr, &key.dsize)) {
if ((dp)->di_dbm == NULL) {
PyErr_SetString(DbmError,
"GDBM object has already been closed");
return -1;
}
check_dbmobject_open(dp);
if (!PyString_Check(arg)) {
PyErr_Format(PyExc_TypeError,
"gdbm key must be string, not %.100s",
arg->ob_type->tp_name);
return -1;
}
key.dptr = PyString_AS_STRING(arg);
key.dsize = PyString_GET_SIZE(arg);
return gdbm_exists(dp->di_dbm, key);
}