diff options
| -rw-r--r-- | modules/cache/mod_socache_shmcb.c | 2 | ||||
| -rw-r--r-- | modules/proxy/balancers/mod_lbmethod_heartbeat.c | 2 | ||||
| -rw-r--r-- | os/unix/unixd.c | 2 | ||||
| -rw-r--r-- | server/buildmark.c | 2 | ||||
| -rw-r--r-- | server/mpm/simple/simple_core.c | 2 | ||||
| -rw-r--r-- | server/scoreboard.c | 4 | ||||
| -rw-r--r-- | server/util.c | 2 | ||||
| -rw-r--r-- | server/util_expr_parse.c | 2 |
8 files changed, 8 insertions, 10 deletions
diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c index 34f8301071..e51a32b40c 100644 --- a/modules/cache/mod_socache_shmcb.c +++ b/modules/cache/mod_socache_shmcb.c @@ -793,7 +793,6 @@ static int shmcb_subcache_store(server_rec *s, SHMCBHeader *header, */ if (header->subcache_data_size - subcache->data_used < total_len || subcache->idx_used == header->index_num) { - unsigned int loop = 0; idx = SHMCB_INDEX(subcache, subcache->idx_pos); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00845) @@ -820,7 +819,6 @@ static int shmcb_subcache_store(server_rec *s, SHMCBHeader *header, header->stat_scrolled++; /* Loop admin */ idx = idx2; - loop++; } while (header->subcache_data_size - subcache->data_used < total_len); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(00846) diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c index 412bac420e..ef38cd92fa 100644 --- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c +++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c @@ -115,7 +115,6 @@ static apr_status_t readfile_heartbeats(const char *path, apr_hash_t *servers, { char *t; - int lineno = 0; apr_bucket_alloc_t *ba = apr_bucket_alloc_create(pool); apr_bucket_brigade *bb = apr_brigade_create(pool, ba); apr_bucket_brigade *tmpbb = apr_brigade_create(pool, ba); @@ -137,7 +136,6 @@ static apr_status_t readfile_heartbeats(const char *path, apr_hash_t *servers, rv = apr_brigade_split_line(tmpbb, bb, APR_BLOCK_READ, sizeof(buf)); - lineno++; if (rv) { return rv; diff --git a/os/unix/unixd.c b/os/unix/unixd.c index eed76f683b..5de0520997 100644 --- a/os/unix/unixd.c +++ b/os/unix/unixd.c @@ -452,7 +452,7 @@ static apr_status_t retained_data_cleanup(void *unused) return APR_SUCCESS; } -AP_DECLARE(ap_unixd_mpm_retained_data *) ap_unixd_mpm_get_retained_data() +AP_DECLARE(ap_unixd_mpm_retained_data *) ap_unixd_mpm_get_retained_data(void) { if (!retained_data) { retained_data = ap_retained_data_create("ap_unixd_mpm_retained_data", diff --git a/server/buildmark.c b/server/buildmark.c index a9cd6844a9..36bd7134ea 100644 --- a/server/buildmark.c +++ b/server/buildmark.c @@ -23,7 +23,7 @@ static const char server_built[] = __DATE__ " " __TIME__; static const char server_built[] = "unknown"; #endif -AP_DECLARE(const char *) ap_get_server_built() +AP_DECLARE(const char *) ap_get_server_built(void) { return server_built; } diff --git a/server/mpm/simple/simple_core.c b/server/mpm/simple/simple_core.c index 24843be735..f4fd73ecac 100644 --- a/server/mpm/simple/simple_core.c +++ b/server/mpm/simple/simple_core.c @@ -28,7 +28,7 @@ static simple_core_t *g_simple_core; APLOG_USE_MODULE(mpm_simple); -simple_core_t *simple_core_get() +simple_core_t *simple_core_get(void) { return g_simple_core; } diff --git a/server/scoreboard.c b/server/scoreboard.c index 181477e357..a203e98f7b 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -654,7 +654,7 @@ AP_DECLARE(void) ap_time_process_request(ap_sb_handle_t *sbh, int status) } } -AP_DECLARE(int) ap_update_global_status() +AP_DECLARE(int) ap_update_global_status(void) { #ifdef HAVE_TIMES if (ap_scoreboard_image == NULL) { @@ -708,7 +708,7 @@ AP_DECLARE(process_score *) ap_get_scoreboard_process(int x) return &ap_scoreboard_image->parent[x]; } -AP_DECLARE(global_score *) ap_get_scoreboard_global() +AP_DECLARE(global_score *) ap_get_scoreboard_global(void) { return ap_scoreboard_image->global; } diff --git a/server/util.c b/server/util.c index 77c4095637..04f40a235a 100644 --- a/server/util.c +++ b/server/util.c @@ -3244,7 +3244,7 @@ AP_DECLARE(apr_status_t) ap_varbuf_regsub(struct ap_varbuf *vb, static const char * const oom_message = "[crit] Memory allocation failed, " "aborting process." APR_EOL_STR; -AP_DECLARE(void) ap_abort_on_oom() +AP_DECLARE(void) ap_abort_on_oom(void) { int written, count = strlen(oom_message); const char *buf = oom_message; diff --git a/server/util_expr_parse.c b/server/util_expr_parse.c index 041f5e77e7..8a0fbde523 100644 --- a/server/util_expr_parse.c +++ b/server/util_expr_parse.c @@ -1232,6 +1232,8 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /* TODO: comppiler warning that this is unused, and it seems to */ + (void)yynerrs; /*------------------------------------------------------------. | yynewstate -- Push a new state, which is found in yystate. | `------------------------------------------------------------*/ |