You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2023/04/27 07:14:36 UTC
svn commit: r1909450 - in /httpd/httpd/trunk: modules/cache/mod_socache_shmcb.c modules/proxy/balancers/mod_lbmethod_heartbeat.c os/unix/unixd.c server/buildmark.c server/mpm/simple/simple_core.c server/scoreboard.c server/util.c server/util_expr_parse.c
Author: icing
Date: Thu Apr 27 07:14:36 2023
New Revision: 1909450
URL: http://svn.apache.org/viewvc?rev=1909450&view=rev
Log:
Make sources build with latest clang version
Modified:
httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c
httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
httpd/httpd/trunk/os/unix/unixd.c
httpd/httpd/trunk/server/buildmark.c
httpd/httpd/trunk/server/mpm/simple/simple_core.c
httpd/httpd/trunk/server/scoreboard.c
httpd/httpd/trunk/server/util.c
httpd/httpd/trunk/server/util_expr_parse.c
Modified: httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c?rev=1909450&r1=1909449&r2=1909450&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c Thu Apr 27 07:14:36 2023
@@ -793,7 +793,6 @@ static int shmcb_subcache_store(server_r
*/
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_r
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)
Modified: httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c?rev=1909450&r1=1909449&r2=1909450&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c (original)
+++ httpd/httpd/trunk/modules/proxy/balancers/mod_lbmethod_heartbeat.c Thu Apr 27 07:14:36 2023
@@ -115,7 +115,6 @@ static apr_status_t readfile_heartbeats(
{
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(
rv = apr_brigade_split_line(tmpbb, bb,
APR_BLOCK_READ, sizeof(buf));
- lineno++;
if (rv) {
return rv;
Modified: httpd/httpd/trunk/os/unix/unixd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/unixd.c?rev=1909450&r1=1909449&r2=1909450&view=diff
==============================================================================
--- httpd/httpd/trunk/os/unix/unixd.c (original)
+++ httpd/httpd/trunk/os/unix/unixd.c Thu Apr 27 07:14:36 2023
@@ -452,7 +452,7 @@ static apr_status_t retained_data_cleanu
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",
Modified: httpd/httpd/trunk/server/buildmark.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/buildmark.c?rev=1909450&r1=1909449&r2=1909450&view=diff
==============================================================================
--- httpd/httpd/trunk/server/buildmark.c (original)
+++ httpd/httpd/trunk/server/buildmark.c Thu Apr 27 07:14:36 2023
@@ -23,7 +23,7 @@ static const char server_built[] = __DAT
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;
}
Modified: httpd/httpd/trunk/server/mpm/simple/simple_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_core.c?rev=1909450&r1=1909449&r2=1909450&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_core.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_core.c Thu Apr 27 07:14:36 2023
@@ -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;
}
Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=1909450&r1=1909449&r2=1909450&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Thu Apr 27 07:14:36 2023
@@ -654,7 +654,7 @@ AP_DECLARE(void) ap_time_process_request
}
}
-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_score
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;
}
Modified: httpd/httpd/trunk/server/util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util.c?rev=1909450&r1=1909449&r2=1909450&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util.c (original)
+++ httpd/httpd/trunk/server/util.c Thu Apr 27 07:14:36 2023
@@ -3244,7 +3244,7 @@ AP_DECLARE(apr_status_t) ap_varbuf_regsu
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;
Modified: httpd/httpd/trunk/server/util_expr_parse.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_parse.c?rev=1909450&r1=1909449&r2=1909450&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_parse.c (original)
+++ httpd/httpd/trunk/server/util_expr_parse.c Thu Apr 27 07:14:36 2023
@@ -1232,6 +1232,8 @@ YYSTYPE yylval YY_INITIAL_VALUE (= yyval
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. |
`------------------------------------------------------------*/