summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-05 10:22:50 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-05 15:07:35 +0100
commitc34d5f445aae8180650dd2cae994bd5573870c04 (patch)
treec5787935da005402ce64fda6890a1137363235f1 /source3/utils
parentee5be748e64f6c8f4814ff322e38511a9a65f4fc (diff)
downloadsamba-c34d5f445aae8180650dd2cae994bd5573870c04.tar.gz
samba-c34d5f445aae8180650dd2cae994bd5573870c04.tar.bz2
samba-c34d5f445aae8180650dd2cae994bd5573870c04.zip
s3:events: change event_add_timed() prototype to match samba4
metze
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/net_lua.c4
-rw-r--r--source3/utils/smbcontrol.c7
2 files changed, 5 insertions, 6 deletions
diff --git a/source3/utils/net_lua.c b/source3/utils/net_lua.c
index 3a5d1bdeb6..e4af9b5577 100644
--- a/source3/utils/net_lua.c
+++ b/source3/utils/net_lua.c
@@ -248,7 +248,7 @@ static int evt_userdata_tostring(lua_State *L) {
static void evt_userdata_sleep_done(struct event_context *event_ctx,
struct timed_event *te,
- const struct timeval *now,
+ struct timeval now,
void *priv)
{
struct thread_reference *ref = talloc_get_type_abort(
@@ -279,7 +279,7 @@ static int evt_userdata_sleep(lua_State *L)
}
te = event_add_timed(p->ev, ref, timeval_current_ofs(0, usecs),
- "evt_userdata_sleep", evt_userdata_sleep_done,
+ evt_userdata_sleep_done,
ref);
if (te == NULL) {
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 9d571f7ee3..330e7643cd 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -65,9 +65,9 @@ static bool send_message(struct messaging_context *msg_ctx,
return ret;
}
-static void timeout_handler(struct event_context *event_ctx,
+static void smbcontrol_timeout(struct event_context *event_ctx,
struct timed_event *te,
- const struct timeval *now,
+ struct timeval now,
void *private_data)
{
bool *timed_out = (bool *)private_data;
@@ -85,8 +85,7 @@ static void wait_replies(struct messaging_context *msg_ctx,
if (!(te = event_add_timed(messaging_event_context(msg_ctx), NULL,
timeval_current_ofs(timeout, 0),
- "smbcontrol_timeout",
- timeout_handler, (void *)&timed_out))) {
+ smbcontrol_timeout, (void *)&timed_out))) {
DEBUG(0, ("event_add_timed failed\n"));
return;
}