sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

pyldb: Always return -1, 0, or 1 in tp_compare functions.

Browse Source
This commit is contained in:
Jelmer Vernooij 2011-01-02 22:34:26 +01:00
parent fdb0aa2b04
commit 0346f51632
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source4/lib/ldb/pyldb.c
View File

@ -60,6 +60,8 @@ typedef intargfunc ssizeargfunc;
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
#endif
#define SIGN(a) (((a) == 0)?0:((a) < 0?-1:1))
static void PyErr_SetLdbError(PyObject *error, int ret, struct ldb_context *ldb_ctx)
{
if (ret == LDB_ERR_PYTHON_EXCEPTION)
@ -1868,8 +1870,9 @@ static PySequenceMethods py_ldb_msg_element_seq = {
static int py_ldb_msg_element_cmp(PyLdbMessageElementObject *self, PyLdbMessageElementObject *other)
{
return ldb_msg_element_compare(PyLdbMessageElement_AsMessageElement(self),
PyLdbMessageElement_AsMessageElement(other));
int ret = ldb_msg_element_compare(PyLdbMessageElement_AsMessageElement(self),
PyLdbMessageElement_AsMessageElement(other));
return SIGN(ret);
}
static PyObject *py_ldb_msg_element_iter(PyLdbMessageElementObject *self)
@ -2372,26 +2375,26 @@ static int py_ldb_msg_compare(PyLdbMessageObject *py_msg1,
if ((msg1->dn != NULL) || (msg2->dn != NULL)) {
ret = ldb_dn_compare(msg1->dn, msg2->dn);
if (ret != 0) {
return ret;
return SIGN(ret);
}
}
ret = msg1->num_elements - msg2->num_elements;
if (ret != 0) {
return ret;
return SIGN(ret);
}
for (i = 0; i < msg1->num_elements; i++) {
ret = ldb_msg_element_compare_name(&msg1->elements[i],
&msg2->elements[i]);
if (ret != 0) {
return ret;
return SIGN(ret);
}
ret = ldb_msg_element_compare(&msg1->elements[i],
&msg2->elements[i]);
if (ret != 0) {
return ret;
return SIGN(ret);
}
}