diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-08 13:34:42 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:05:41 -0500 |
commit | 7a287e07043cf937e22f8051c1a324d8a30c53e1 (patch) | |
tree | fc71bd59d3ce06427d666e8687f8e981c5d13e8c /source4/smbd | |
parent | dccf3f99e45137b6cd18c1de1c79808ad67130d1 (diff) | |
download | samba-7a287e07043cf937e22f8051c1a324d8a30c53e1.tar.gz samba-7a287e07043cf937e22f8051c1a324d8a30c53e1.tar.bz2 samba-7a287e07043cf937e22f8051c1a324d8a30c53e1.zip |
r25028: Fix more warnings.
(This used to be commit 3aa7ee4a0d8837471deeaa1c5a1f4a0d2a14aa6e)
Diffstat (limited to 'source4/smbd')
-rw-r--r-- | source4/smbd/pidfile.c | 1 | ||||
-rw-r--r-- | source4/smbd/server.c | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source4/smbd/pidfile.c b/source4/smbd/pidfile.c index 167555fd28..57ff68709f 100644 --- a/source4/smbd/pidfile.c +++ b/source4/smbd/pidfile.c @@ -22,6 +22,7 @@ #include "includes.h" #include "system/filesys.h" #include "param/param.h" +#include "smbd/pidfile.h" /** * @file diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 93f6f03be5..23d996bf2e 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -153,7 +153,7 @@ static void setup_signals(void) static void server_stdin_handler(struct event_context *event_ctx, struct fd_event *fde, uint16_t flags, void *private) { - const char *binary_name = private; + const char *binary_name = (const char *)private; uint8_t c; if (read(0, &c, 1) == 0) { DEBUG(0,("%s: EOF on stdin - terminating\n", binary_name)); @@ -169,10 +169,11 @@ static void server_stdin_handler(struct event_context *event_ctx, struct fd_even /* die if the user selected maximum runtime is exceeded */ -_NORETURN_ static void max_runtime_handler(struct event_context *ev, struct timed_event *te, - struct timeval t, void *private) +_NORETURN_ static void max_runtime_handler(struct event_context *ev, + struct timed_event *te, + struct timeval t, void *private) { - const char *binary_name = private; + const char *binary_name = (const char *)private; DEBUG(0,("%s: maximum runtime exceeded - terminating\n", binary_name)); exit(0); } |