sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

tdb2: fix return handling in pytdb wrapper.

Browse Source 
tdb_close() does genuinely return non-zero, not an error code, even in tdb2.
And tdb_exists() returns true or false, not an error code.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2011-09-14 08:13:27 +09:30
parent 2237daed7e
commit c5c0a4d331
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/tdb2/pytdb.c
View File

@ -173,12 +173,15 @@ static PyObject *obj_unlockall_read(PyTdbObject *self)
static PyObject *obj_close(PyTdbObject *self)
{
enum TDB_ERROR ret;
int ret;
if (self->closed)
Py_RETURN_NONE;
ret = tdb_close(self->ctx);
self->closed = true;
PyErr_TDB_ERROR_IS_ERR_RAISE(ret);
if (ret != 0) {
PyErr_SetTDBError(TDB_ERR_IO);
return NULL;
}
Py_RETURN_NONE;
}
@ -265,17 +268,16 @@ static PyObject *obj_delete(PyTdbObject *self, PyObject *args)
static PyObject *obj_has_key(PyTdbObject *self, PyObject *args)
{
TDB_DATA key;
enum TDB_ERROR ret;
PyObject *py_key;
if (!PyArg_ParseTuple(args, "O", &py_key))
return NULL;
key = PyString_AsTDB_DATA(py_key);
ret = tdb_exists(self->ctx, key);
if (ret == TDB_ERR_NOEXIST)
return Py_False;
PyErr_TDB_ERROR_IS_ERR_RAISE(ret);
return Py_True;
if (tdb_exists(self->ctx, key))
return Py_True;
if (tdb_error(self->ctx) != TDB_ERR_NOEXIST)
PyErr_TDB_ERROR_IS_ERR_RAISE(tdb_error(self->ctx));
return Py_False;
}
static PyObject *obj_store(PyTdbObject *self, PyObject *args)