diff options
Diffstat (limited to 'source4/lib/messaging/pymessaging.c')
-rw-r--r-- | source4/lib/messaging/pymessaging.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c index 358d205b53..017b6f91a2 100644 --- a/source4/lib/messaging/pymessaging.c +++ b/source4/lib/messaging/pymessaging.c @@ -45,12 +45,12 @@ static bool server_id_from_py(PyObject *object, struct server_id *server_id) } if (PyTuple_Size(object) == 3) { - return PyArg_ParseTuple(object, "iii", &server_id->id, &server_id->id2, &server_id->node); + return PyArg_ParseTuple(object, "iii", &server_id->pid, &server_id->id2, &server_id->node); } else { - int id, id2; - if (!PyArg_ParseTuple(object, "ii", &id, &id2)) + int pid, id2; + if (!PyArg_ParseTuple(object, "ii", &pid, &id2)) return false; - *server_id = cluster_id(id, id2); + *server_id = cluster_id(pid, id2); return true; } } @@ -159,7 +159,7 @@ static void py_msg_callback_wrapper(struct messaging_context *msg, void *private PyObject *callback = (PyObject *)private_data; PyObject_CallFunction(callback, discard_const_p(char, "i(iii)s#"), msg_type, - server_id.id, server_id.id2, server_id.node, + server_id.pid, server_id.id2, server_id.node, data->data, data->length); } @@ -229,7 +229,7 @@ static PyObject *py_messaging_server_id(PyObject *obj, void *closure) messaging_Object *iface = (messaging_Object *)obj; struct server_id server_id = messaging_get_server_id(iface->msg_ctx); - return Py_BuildValue("(iii)", server_id.id, server_id.id2, + return Py_BuildValue("(iii)", server_id.pid, server_id.id2, server_id.node); } |