romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-10 06:47:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

mod_curltest: fix compiler warnings

Browse source 
```
mod_curltest.c:331:25: warning: result of comparison of unsigned expression >= 0 is always true [-Wtautological-unsigned-zero-compare]
  331 |           if(chunk_size >= 0) {
      |              ~~~~~~~~~~ ^  ~
mod_curltest.c:421:9: warning: declaration shadows a local variable [-Wshadow]
  421 |     int i, hd_len = (16 * 1024);
      |         ^
mod_curltest.c:288:7: note: previous declaration is here
  288 |   int i, chunks = 3, error_bucket = 1;
      |       ^
mod_curltest.c:501:40: warning: format specifies type 'int' but the argument has type 'unsigned int' [-Wformat]
  500 |                 "error_handler: request cleanup, r->status=%d, aborted=%d, "
      |                                                                        ~~
      |                                                                        %u
  501 |                 "close=%d", r->status, c->aborted, close_conn);
      |                                        ^~~~~~~~~~
mod_curltest.c:837:1: warning: missing field 'lock' initializer [-Wmissing-field-initializers]
  837 | };
      | ^
mod_curltest.c:914:43: warning: format specifies type 'int' but the argument has type 'apr_time_t' (aka 'long') [-Wformat]
  914 |     char *v = apr_psprintf(r->pool, "%d", limitrec.duration_sec);
      |                                      ~~   ^~~~~~~~~~~~~~~~~~~~~
      |                                      %ld
mod_curltest.c:956:16: warning: unused variable 'rv' [-Wunused-variable]
  956 |   apr_status_t rv;
      |                ^~
```

Closes #22214
This commit is contained in:
Viktor Szakats 2026-06-29 11:17:04 +02:00
parent d647b84d53
commit c9d8a6bc10
No known key found for this signature in database
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/http/testenv/mod_curltest/mod_curltest.c
View file

@ -328,15 +328,13 @@ static int curltest_tweak_handler(request_rec *r)
}
else if(!strcmp("chunk_size", arg)) {
chunk_size = (int)apr_atoi64(val);
if(chunk_size >= 0) {
if(chunk_size > sizeof(buffer)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"chunk_size %zu too large", chunk_size);
ap_die(HTTP_BAD_REQUEST, r);
return OK;
}
continue;
if(chunk_size > sizeof(buffer)) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
"chunk_size %zu too large", chunk_size);
ap_die(HTTP_BAD_REQUEST, r);
return OK;
}
continue;
}
else if(!strcmp("id", arg)) {
/* an id for repeated requests with curl's URL globbing */
@ -418,7 +416,7 @@ static int curltest_tweak_handler(request_rec *r)
/* Discourage content-encodings */
apr_table_unset(r->headers_out, "Content-Encoding");
if(x_hd_len > 0) {
int i, hd_len = (16 * 1024);
int hd_len = (16 * 1024);
int n = (x_hd_len / hd_len);
char *hd_val = apr_palloc(r->pool, hd_len);
memset(hd_val, 'X', hd_len);
@ -497,7 +495,7 @@ cleanup:
r->connection->keepalive = AP_CONN_CLOSE;
}
ap_log_rerror(APLOG_MARK, APLOG_TRACE1, rv, r,
"error_handler: request cleanup, r->status=%d, aborted=%d, "
"error_handler: request cleanup, r->status=%d, aborted=%u, "
"close=%d", r->status, c->aborted, close_conn);
if(rv == APR_SUCCESS) {
return OK;
@ -833,7 +831,7 @@ struct curltest_limit_rec {
};
static struct curltest_limit_rec limitrec = {
0, 5, 0, 2
0, 5, 0, 2, NULL
};
static int curltest_limit_handler(request_rec *r)
@ -911,7 +909,7 @@ static int curltest_limit_handler(request_rec *r)
apr_table_setn(r->subprocess_env, "no-gzip", "1");
if(denied) {
char *v = apr_psprintf(r->pool, "%d", limitrec.duration_sec);
char *v = apr_psprintf(r->pool, "%ld", limitrec.duration_sec);
apr_table_set(r->headers_out, "Retry-After", v);
}
@ -953,7 +951,6 @@ static int curltest_post_config(apr_pool_t *p, apr_pool_t *plog,
{
void *data = NULL;
const char *key = "mod_curltest_init_counter";
apr_status_t rv;
(void)p;
(void)plog;