diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-05-07 09:35:35 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:52 -0500 |
| commit | e6383f47629368d9dd4e803f17566a24e9d7359e (patch) | |
| tree | cebde89910087c3220786f209da2c4e32a71bc46 /source3/smbd/server.c | |
| parent | d1153fc79076741571b203b1d70f1536bde208f0 (diff) | |
| download | samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.gz samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.bz2 samba-e6383f47629368d9dd4e803f17566a24e9d7359e.zip | |
r22736: Start to merge the low-hanging fruit from the now 7000-line cluster patch.
This changes "struct process_id" to "struct server_id", keeping both is
just too much hassle. No functional change (I hope ;-))
Volker
(This used to be commit 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8)
Diffstat (limited to 'source3/smbd/server.c')
| -rw-r--r-- | source3/smbd/server.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 3422290a90..1020ad3aca 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -87,7 +87,7 @@ struct messaging_context *smbd_messaging_context(void) What to do when smb.conf is updated. ********************************************************************/ -static void smb_conf_updated(int msg_type, struct process_id src, +static void smb_conf_updated(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { DEBUG(10,("smb_conf_updated: Got message saying smb.conf was updated. Reloading.\n")); @@ -99,7 +99,7 @@ static void smb_conf_updated(int msg_type, struct process_id src, Delete a statcache entry. ********************************************************************/ -static void smb_stat_cache_delete(int msg_type, struct process_id src, +static void smb_stat_cache_delete(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { const char *name = (const char *)buf; @@ -150,7 +150,7 @@ static void killkids(void) somewhere else. ****************************************************************************/ -static void msg_sam_sync(int UNUSED(msg_type), struct process_id UNUSED(pid), +static void msg_sam_sync(int UNUSED(msg_type), struct server_id UNUSED(pid), void *UNUSED(buf), size_t UNUSED(len), void *private_data) { @@ -162,7 +162,7 @@ static void msg_sam_sync(int UNUSED(msg_type), struct process_id UNUSED(pid), somewhere else. ****************************************************************************/ -static void msg_sam_repl(int msg_type, struct process_id pid, +static void msg_sam_repl(int msg_type, struct server_id pid, void *buf, size_t len, void *private_data) { uint32 low_serial; @@ -196,7 +196,7 @@ static BOOL open_sockets_inetd(void) return True; } -static void msg_exit_server(int msg_type, struct process_id src, +static void msg_exit_server(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { DEBUG(3, ("got a SHUTDOWN message\n")); @@ -204,7 +204,7 @@ static void msg_exit_server(int msg_type, struct process_id src, } #ifdef DEVELOPER -static void msg_inject_fault(int msg_type, struct process_id src, +static void msg_inject_fault(int msg_type, struct server_id src, void *buf, size_t len, void *private_data) { int sig; @@ -921,7 +921,7 @@ extern void build_options(BOOL screen); } if (profile_level != NULL) { int pl = atoi(profile_level); - struct process_id src; + struct server_id src; DEBUG(1, ("setting profiling level: %s\n",profile_level)); src.pid = getpid(); |