diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
| commit | 37e6849d451c4f49c6a0c96a78a5ef81baab83d4 (patch) | |
| tree | d1e443f66fa367340ef04d39349e50e7100b9b5f /source3/utils | |
| parent | de7dc2cec059305d28cc75a5347bfd88f3cb5c95 (diff) | |
| parent | 0581094023ba5e561184a2ea57f6e905161de978 (diff) | |
| download | samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.gz samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.bz2 samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_lua.c | 4 | ||||
| -rw-r--r-- | source3/utils/smbcontrol.c | 7 |
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; } |