summaryrefslogtreecommitdiff
path: root/source4/lib/messaging
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-02-02 08:20:52 +0100
committerStefan Metzmacher <metze@samba.org>2009-02-02 13:08:25 +0100
commit735af62105c563f9ee2ffd8bc21e914499d5ee76 (patch)
treebe18f331665c465142ab2e3d4742d6bbb9167fd0 /source4/lib/messaging
parentb7f298348934e86b1f8026bd445ec167439581f6 (diff)
downloadsamba-735af62105c563f9ee2ffd8bc21e914499d5ee76.tar.gz
samba-735af62105c563f9ee2ffd8bc21e914499d5ee76.tar.bz2
samba-735af62105c563f9ee2ffd8bc21e914499d5ee76.zip
s4:lib/messaging: s/private/private_data
metze
Diffstat (limited to 'source4/lib/messaging')
-rw-r--r--source4/lib/messaging/pymessaging.c4
-rw-r--r--source4/lib/messaging/tests/messaging.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 535da4526c..96981895b6 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -159,11 +159,11 @@ static PyObject *py_messaging_send(PyObject *self, PyObject *args, PyObject *kwa
Py_RETURN_NONE;
}
-static void py_msg_callback_wrapper(struct messaging_context *msg, void *private,
+static void py_msg_callback_wrapper(struct messaging_context *msg, void *private_data,
uint32_t msg_type,
struct server_id server_id, DATA_BLOB *data)
{
- PyObject *callback = (PyObject *)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,
diff --git a/source4/lib/messaging/tests/messaging.c b/source4/lib/messaging/tests/messaging.c
index 838de55d83..f61132caac 100644
--- a/source4/lib/messaging/tests/messaging.c
+++ b/source4/lib/messaging/tests/messaging.c
@@ -29,7 +29,7 @@
static uint32_t msg_pong;
-static void ping_message(struct messaging_context *msg, void *private,
+static void ping_message(struct messaging_context *msg, void *private_data,
uint32_t msg_type, struct server_id src, DATA_BLOB *data)
{
NTSTATUS status;
@@ -39,17 +39,17 @@ static void ping_message(struct messaging_context *msg, void *private,
}
}
-static void pong_message(struct messaging_context *msg, void *private,
+static void pong_message(struct messaging_context *msg, void *private_data,
uint32_t msg_type, struct server_id src, DATA_BLOB *data)
{
- int *count = private;
+ int *count = (int *)private_data;
(*count)++;
}
-static void exit_message(struct messaging_context *msg, void *private,
+static void exit_message(struct messaging_context *msg, void *private_data,
uint32_t msg_type, struct server_id src, DATA_BLOB *data)
{
- talloc_free(private);
+ talloc_free(private_data);
exit(0);
}