From e228d59e1c3b99b0c77be8abab8b60d84ef219b2 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Wed, 15 Aug 2012 13:14:03 +0200 Subject: [PATCH 2/6] Fix non-ANSI function declarations. The proper way to declare a function taking no parameters isn't: foo bar(); But this instead: foo bar(void); Signed-off-by: Cyril Brulebois --- src/configfile.c | 2 +- src/fdevent.c | 2 +- src/mod_cgi.c | 2 +- src/mod_fastcgi.c | 8 ++++---- src/mod_proxy.c | 2 +- src/mod_rewrite.c | 2 +- src/mod_scgi.c | 8 ++++---- src/mod_setenv.c | 2 +- src/mod_ssi_expr.c | 2 +- src/proc_open.c | 2 +- src/server.c | 2 +- tests/fcgi-auth.c | 2 +- tests/fcgi-responder.c | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/configfile.c b/src/configfile.c index a03c9bd..bb71b95 100644 --- a/src/configfile.c +++ b/src/configfile.c @@ -1000,7 +1000,7 @@ int config_parse_file(server *srv, config_t *context, const char *fn) { return ret; } -static char* getCWD() { +static char* getCWD(void) { char *s, *s1; size_t len; #ifdef PATH_MAX diff --git a/src/fdevent.c b/src/fdevent.c index 0ba73b9..fdd178d 100644 --- a/src/fdevent.c +++ b/src/fdevent.c @@ -100,7 +100,7 @@ int fdevent_reset(fdevents *ev) { return 0; } -static fdnode *fdnode_init() { +static fdnode *fdnode_init(void) { fdnode *fdn; fdn = calloc(1, sizeof(*fdn)); diff --git a/src/mod_cgi.c b/src/mod_cgi.c index c50bfd1..d6f7528 100644 --- a/src/mod_cgi.c +++ b/src/mod_cgi.c @@ -82,7 +82,7 @@ typedef struct { buffer *response_header; } handler_ctx; -static handler_ctx * cgi_handler_ctx_init() { +static handler_ctx * cgi_handler_ctx_init(void) { handler_ctx *hctx = calloc(1, sizeof(*hctx)); assert(hctx); diff --git a/src/mod_fastcgi.c b/src/mod_fastcgi.c index 4c11e36..de6bfd1 100644 --- a/src/mod_fastcgi.c +++ b/src/mod_fastcgi.c @@ -483,7 +483,7 @@ static int fastcgi_status_init(server *srv, buffer *b, fcgi_extension_host *host return 0; } -static handler_ctx * handler_ctx_init() { +static handler_ctx * handler_ctx_init(void) { handler_ctx * hctx; hctx = calloc(1, sizeof(*hctx)); @@ -521,7 +521,7 @@ static void handler_ctx_free(server *srv, handler_ctx *hctx) { free(hctx); } -static fcgi_proc *fastcgi_process_init() { +static fcgi_proc *fastcgi_process_init(void) { fcgi_proc *f; f = calloc(1, sizeof(*f)); @@ -545,7 +545,7 @@ static void fastcgi_process_free(fcgi_proc *f) { free(f); } -static fcgi_extension_host *fastcgi_host_init() { +static fcgi_extension_host *fastcgi_host_init(void) { fcgi_extension_host *f; f = calloc(1, sizeof(*f)); @@ -581,7 +581,7 @@ static void fastcgi_host_free(fcgi_extension_host *h) { } -static fcgi_exts *fastcgi_extensions_init() { +static fcgi_exts *fastcgi_extensions_init(void) { fcgi_exts *f; f = calloc(1, sizeof(*f)); diff --git a/src/mod_proxy.c b/src/mod_proxy.c index c93ba3d..abbc7fa 100644 --- a/src/mod_proxy.c +++ b/src/mod_proxy.c @@ -115,7 +115,7 @@ typedef struct { /* ok, we need a prototype */ static handler_t proxy_handle_fdevent(server *srv, void *ctx, int revents); -static handler_ctx * handler_ctx_init() { +static handler_ctx * handler_ctx_init(void) { handler_ctx * hctx; diff --git a/src/mod_rewrite.c b/src/mod_rewrite.c index 058e756..9672c4e 100644 --- a/src/mod_rewrite.c +++ b/src/mod_rewrite.c @@ -45,7 +45,7 @@ typedef struct { plugin_config conf; } plugin_data; -static handler_ctx * handler_ctx_init() { +static handler_ctx * handler_ctx_init(void) { handler_ctx * hctx; hctx = calloc(1, sizeof(*hctx)); diff --git a/src/mod_scgi.c b/src/mod_scgi.c index b13dbf4..6ae0782 100644 --- a/src/mod_scgi.c +++ b/src/mod_scgi.c @@ -347,7 +347,7 @@ static void reset_signals(void) { signal(SIGUSR1, SIG_DFL); } -static handler_ctx * handler_ctx_init() { +static handler_ctx * handler_ctx_init(void) { handler_ctx * hctx; hctx = calloc(1, sizeof(*hctx)); @@ -388,7 +388,7 @@ static void handler_ctx_free(handler_ctx *hctx) { free(hctx); } -static scgi_proc *scgi_process_init() { +static scgi_proc *scgi_process_init(void) { scgi_proc *f; f = calloc(1, sizeof(*f)); @@ -410,7 +410,7 @@ static void scgi_process_free(scgi_proc *f) { free(f); } -static scgi_extension_host *scgi_host_init() { +static scgi_extension_host *scgi_host_init(void) { scgi_extension_host *f; f = calloc(1, sizeof(*f)); @@ -442,7 +442,7 @@ static void scgi_host_free(scgi_extension_host *h) { } -static scgi_exts *scgi_extensions_init() { +static scgi_exts *scgi_extensions_init(void) { scgi_exts *f; f = calloc(1, sizeof(*f)); diff --git a/src/mod_setenv.c b/src/mod_setenv.c index 4419b61..d9cf94d 100644 --- a/src/mod_setenv.c +++ b/src/mod_setenv.c @@ -30,7 +30,7 @@ typedef struct { plugin_config conf; } plugin_data; -static handler_ctx * handler_ctx_init() { +static handler_ctx * handler_ctx_init(void) { handler_ctx * hctx; hctx = calloc(1, sizeof(*hctx)); diff --git a/src/mod_ssi_expr.c b/src/mod_ssi_expr.c index c5d8581..f839987 100644 --- a/src/mod_ssi_expr.c +++ b/src/mod_ssi_expr.c @@ -19,7 +19,7 @@ typedef struct { int in_cond; } ssi_tokenizer_t; -ssi_val_t *ssi_val_init() { +ssi_val_t *ssi_val_init(void) { ssi_val_t *s; s = calloc(1, sizeof(*s)); diff --git a/src/proc_open.c b/src/proc_open.c index 3c065d0..e9393e0 100644 --- a/src/proc_open.c +++ b/src/proc_open.c @@ -331,7 +331,7 @@ int proc_open_buffer(const char *command, buffer *in, buffer *out, buffer *err) /* {{{ test */ #ifdef DEBUG_PROC_OPEN -int main() { +int main(void) { proc_handler_t proc; buffer *in = buffer_init(), *out = buffer_init(), *err = buffer_init(); int wstatus; diff --git a/src/server.c b/src/server.c index 2878d18..590a9d5 100644 --- a/src/server.c +++ b/src/server.c @@ -68,7 +68,7 @@ #ifdef HAVE_GETUID # ifndef HAVE_ISSETUGID -static int l_issetugid() { +static int l_issetugid(void) { return (geteuid() != getuid() || getegid() != getgid()); } diff --git a/tests/fcgi-auth.c b/tests/fcgi-auth.c index 26bbd0f..d340b2e 100644 --- a/tests/fcgi-auth.c +++ b/tests/fcgi-auth.c @@ -10,7 +10,7 @@ #include #include -int main () { +int main (void) { char* p; while (FCGI_Accept() >= 0) { diff --git a/tests/fcgi-responder.c b/tests/fcgi-responder.c index 81f8ca8..de04d0e 100644 --- a/tests/fcgi-responder.c +++ b/tests/fcgi-responder.c @@ -10,7 +10,7 @@ #include #include -int main () { +int main (void) { int num_requests = 2; while (num_requests > 0 && -- 1.7.10.4