diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-05-30 16:19:22 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-05-30 16:19:22 +1000 |
commit | db6122ec104e80ee2e02b1170ff808b6456b780b (patch) | |
tree | b73d8314f0787c4423ba3b9ed4f1b655f1918dc4 /source | |
parent | 7598c8389745fcc77da341b4af2dcef6a01db700 (diff) | |
download | samba-db6122ec104e80ee2e02b1170ff808b6456b780b.tar.gz |
two more places where the wrong type is passed to PyArg_ParseTupleAndKeywords()
Diffstat (limited to 'source')
-rw-r--r-- | source/lib/messaging/pymessaging.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/lib/messaging/pymessaging.c b/source/lib/messaging/pymessaging.c index 869508fca65..41c9c82b1f3 100644 --- a/source/lib/messaging/pymessaging.c +++ b/source/lib/messaging/pymessaging.c @@ -162,11 +162,11 @@ static void py_msg_callback_wrapper(struct messaging_context *msg, void *private static PyObject *py_messaging_register(PyObject *self, PyObject *args, PyObject *kwargs) { messaging_Object *iface = (messaging_Object *)self; - uint32_t msg_type = -1; + int msg_type = -1; PyObject *callback; NTSTATUS status; const char *kwnames[] = { "callback", "msg_type", NULL }; - + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|i:send", discard_const_p(char *, kwnames), &callback, &msg_type)) { return NULL; @@ -175,8 +175,10 @@ static PyObject *py_messaging_register(PyObject *self, PyObject *args, PyObject Py_INCREF(callback); if (msg_type == -1) { + uint32_t msg_type32 = msg_type; status = messaging_register_tmp(iface->msg_ctx, callback, - py_msg_callback_wrapper, &msg_type); + py_msg_callback_wrapper, &msg_type32); + msg_type = msg_type32; } else { status = messaging_register(iface->msg_ctx, callback, msg_type, py_msg_callback_wrapper); @@ -192,7 +194,7 @@ static PyObject *py_messaging_register(PyObject *self, PyObject *args, PyObject static PyObject *py_messaging_deregister(PyObject *self, PyObject *args, PyObject *kwargs) { messaging_Object *iface = (messaging_Object *)self; - uint32_t msg_type = -1; + int msg_type = -1; PyObject *callback; const char *kwnames[] = { "callback", "msg_type", NULL }; |