diff options
author | Stefan Metzmacher <metze@samba.org> | 2004-05-25 17:24:24 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:16 -0500 |
commit | f88bf54c7f6d1c2ef833047eb8327953c304b5ff (patch) | |
tree | 07da4ab8641b2200eaca5b5ea9adba26b0712277 /source4/smbd | |
parent | f2ad98a165cdec6d344a96aeb21a38518a10720a (diff) | |
download | samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.gz samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.bz2 samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.zip |
r889: convert samba4 to use [u]int16_t instead of [u]int16
metze
(This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3)
Diffstat (limited to 'source4/smbd')
-rw-r--r-- | source4/smbd/build_options.c | 2 | ||||
-rw-r--r-- | source4/smbd/process_model.h | 4 | ||||
-rw-r--r-- | source4/smbd/process_single.c | 4 | ||||
-rw-r--r-- | source4/smbd/process_standard.c | 4 | ||||
-rw-r--r-- | source4/smbd/process_thread.c | 4 | ||||
-rw-r--r-- | source4/smbd/server.c | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/source4/smbd/build_options.c b/source4/smbd/build_options.c index dea17df2e0..bdb4ce3549 100644 --- a/source4/smbd/build_options.c +++ b/source4/smbd/build_options.c @@ -525,7 +525,7 @@ void build_options(BOOL screen) output(screen," sizeof(int): %d\n",sizeof(int)); output(screen," sizeof(long): %d\n",sizeof(long)); output(screen," sizeof(uint8): %d\n",sizeof(uint8)); - output(screen," sizeof(uint16): %d\n",sizeof(uint16)); + output(screen," sizeof(uint16_t): %d\n",sizeof(uint16_t)); output(screen," sizeof(uint32_t): %d\n",sizeof(uint32_t)); output(screen," sizeof(short): %d\n",sizeof(short)); output(screen," sizeof(void*): %d\n",sizeof(void*)); diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h index 688ae65226..f56635e62c 100644 --- a/source4/smbd/process_model.h +++ b/source4/smbd/process_model.h @@ -39,10 +39,10 @@ struct model_ops { void (*model_startup)(void); /* function to accept new connection */ - void (*accept_connection)(struct event_context *, struct fd_event *, time_t, uint16); + void (*accept_connection)(struct event_context *, struct fd_event *, time_t, uint16_t); /* function to accept new rpc over tcp connection */ - void (*accept_rpc_connection)(struct event_context *, struct fd_event *, time_t, uint16); + void (*accept_rpc_connection)(struct event_context *, struct fd_event *, time_t, uint16_t); /* function to terminate a connection */ void (*terminate_connection)(struct server_context *smb, const char *reason); diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index 0c626e45c6..ac0d9fc6f9 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -32,7 +32,7 @@ static void model_startup(void) /* called when a listening socket becomes readable */ -static void accept_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16 flags) +static void accept_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) { int accepted_fd; struct sockaddr addr; @@ -58,7 +58,7 @@ static void accept_connection(struct event_context *ev, struct fd_event *fde, ti /* called when a rpc listening socket becomes readable */ -static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16 flags) +static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) { int accepted_fd; struct sockaddr addr; diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index 3dfb8d7e27..bf21e21157 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -32,7 +32,7 @@ static void model_startup(void) /* called when a listening socket becomes readable */ -static void accept_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16 flags) +static void accept_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) { int accepted_fd; struct sockaddr addr; @@ -82,7 +82,7 @@ static void accept_connection(struct event_context *ev, struct fd_event *fde, ti /* called when a rpc listening socket becomes readable */ -static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16 flags) +static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) { int accepted_fd; struct sockaddr addr; diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index d37cf8d7ff..5bf18e34d2 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -46,7 +46,7 @@ static int get_id(struct request_context *req) called when a listening socket becomes readable */ static void accept_connection(struct event_context *ev, struct fd_event *fde, - time_t t, uint16 flags) + time_t t, uint16_t flags) { int accepted_fd, rc; struct sockaddr addr; @@ -91,7 +91,7 @@ static void accept_connection(struct event_context *ev, struct fd_event *fde, /* called when a rpc listening socket becomes readable */ -static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16 flags) +static void accept_rpc_connection(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) { int accepted_fd, rc; struct sockaddr addr; diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 8a06a5b7df..1dc8082b30 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -38,7 +38,7 @@ void exit_server(struct server_context *smb, const char *reason) */ static void setup_listen(struct event_context *events, const struct model_ops *model_ops, - void (*accept_handler)(struct event_context *,struct fd_event *,time_t,uint16), + void (*accept_handler)(struct event_context *,struct fd_event *,time_t,uint16_t), struct in_addr *ifip, unsigned port) { struct fd_event fde; @@ -302,7 +302,7 @@ static void setup_process_model(struct event_context *events, /* Output the build options to the debug log */ build_options(False); - if (sizeof(uint16) < 2 || sizeof(uint32_t) < 4) { + if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4) { DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n")); exit(1); } |