Author: astieger
Date: Fri Nov 27 16:44:15 2015
New Revision: 1716896
URL: http://svn.apache.org/viewvc?rev=1716896&view=rev
Log:
Fix format warnings when printing apr_size_t with %d
* buckets/log_wrapper_buckets.c
(serf_log_wrapped_readline,serf_log_wrapped_read_iovec,
serf_log_wrapped_read): use APR_SIZE_T_FMT
* buckets/ssl_buckets.c
(bio_bucket_read,ssl_decrypt,ssl_encrypt): same
Modified:
serf/trunk/buckets/log_wrapper_buckets.c
serf/trunk/buckets/ssl_buckets.c
Modified: serf/trunk/buckets/log_wrapper_buckets.c
URL:
http://svn.apache.org/viewvc/serf/trunk/buckets/log_wrapper_buckets.c?rev=1716896&r1=1716895&r2=1716896&view=diff
==============================================================================
--- serf/trunk/buckets/log_wrapper_buckets.c (original)
+++ serf/trunk/buckets/log_wrapper_buckets.c Fri Nov 27 16:44:15 2015
@@ -59,7 +59,7 @@ serf_log_wrapped_readline(serf_bucket_t
if (*len) {
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, ctx->prefix, ctx->config,
- "--- %d bytes. --\n", *len);
+ "--- %"APR_SIZE_T_FMT" bytes. --\n", *len);
serf__log(LOGLVL_DEBUG, LOGCOMP_RAWMSG, ctx->prefix, ctx->config,
"%.*s\n", *len, *data);
}
@@ -89,7 +89,7 @@ serf_log_wrapped_read_iovec(serf_bucket_
for (i = 0, len = 0; i < *vecs_used; i++)
len += vecs[i].iov_len;
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, ctx->prefix, ctx->config,
- "--- %d bytes. --\n", len);
+ "--- %"APR_SIZE_T_FMT" bytes. --\n", len);
for (i = 0; i < *vecs_used; i++) {
serf__log_nopref(LOGLVL_DEBUG, LOGCOMP_RAWMSG, ctx->config,
@@ -114,7 +114,7 @@ serf_log_wrapped_read(serf_bucket_t *buc
"Error %d while reading.\n", status);
else if (*len) {
serf__log(LOGLVL_DEBUG, LOGCOMP_CONN, ctx->prefix, ctx->config,
- "--- %d bytes. --\n", *len);
+ "--- %"APR_SIZE_T_FMT" bytes. --\n", *len);
serf__log(LOGLVL_DEBUG, LOGCOMP_RAWMSG, ctx->prefix, ctx->config,
"%.*s\n", *len, *data);
}
Modified: serf/trunk/buckets/ssl_buckets.c
URL:
http://svn.apache.org/viewvc/serf/trunk/buckets/ssl_buckets.c?rev=1716896&r1=1716895&r2=1716896&view=diff
==============================================================================
--- serf/trunk/buckets/ssl_buckets.c (original)
+++ serf/trunk/buckets/ssl_buckets.c Fri Nov 27 16:44:15 2015
@@ -347,7 +347,7 @@ static int bio_bucket_read(BIO *bio, cha
}
serf__log(LOGLVL_DEBUG, LOGCOMP_SSL, __FILE__, ctx->config,
- "bio_bucket_read received %d bytes (%d)\n", len, status);
+ "bio_bucket_read received %"APR_SIZE_T_FMT" bytes (%d)\n", len,
status);
memcpy(in, data, len);
return len;
@@ -957,7 +957,7 @@ static apr_status_t ssl_decrypt(void *ba
}
serf__log(LOGLVL_DEBUG, LOGCOMP_SSL, __FILE__, ctx->config,
- "ssl_decrypt: begin %d\n", bufsize);
+ "ssl_decrypt: begin %" APR_SIZE_T_FMT "\n", bufsize);
ctx->want_read = FALSE; /* Reading now */
ctx->crypt_status = APR_SUCCESS; /* Clear before calling SSL */
@@ -1003,7 +1003,7 @@ static apr_status_t ssl_decrypt(void *ba
*len = ssl_len;
status = ctx->crypt_status;
serf__log(LOGLVL_DEBUG, LOGCOMP_SSLMSG, __FILE__, ctx->config,
- "---\n%.*s\n-(%d)-\n", *len, buf, *len);
+ "---\n%.*s\n-(%"APR_SIZE_T_FMT")-\n", *len, buf, *len);
}
@@ -1039,7 +1039,7 @@ static apr_status_t ssl_decrypt(void *ba
}
serf__log(LOGLVL_DEBUG, LOGCOMP_SSL, __FILE__, ctx->config,
- "ssl_decrypt: %d %d\n", status, *len);
+ "ssl_decrypt: %d %"APR_SIZE_T_FMT"\n", status, *len);
return status;
}
@@ -1058,7 +1058,7 @@ static apr_status_t ssl_encrypt(void *ba
return ctx->fatal_err;
serf__log(LOGLVL_DEBUG, LOGCOMP_SSL, __FILE__, ctx->config,
- "ssl_encrypt: begin %d\n", bufsize);
+ "ssl_encrypt: begin %"APR_SIZE_T_FMT"\n", bufsize);
if (!ctx->handshake_done) {
@@ -1085,7 +1085,7 @@ static apr_status_t ssl_encrypt(void *ba
}
serf__log(LOGLVL_DEBUG, LOGCOMP_SSL, __FILE__, ctx->config,
- "ssl_encrypt: %d %d (quick read)\n",
+ "ssl_encrypt: %d %"APR_SIZE_T_FMT" (quick read)\n",
status, *len);
return status;
@@ -1130,7 +1130,7 @@ static apr_status_t ssl_encrypt(void *ba
interim_len = vecs_data_len;
serf__log(LOGLVL_DEBUG, LOGCOMP_SSL, __FILE__, ctx->config,
- "ssl_encrypt: bucket read %d bytes; "\
+ "ssl_encrypt: bucket read %"APR_SIZE_T_FMT" bytes; "\
"status %d\n", interim_len, status);
/* When an SSL_write() operation has to be repeated because of
@@ -1165,7 +1165,7 @@ static apr_status_t ssl_encrypt(void *ba
serf_bucket_mem_free(ctx->allocator, vecs_data);
serf__log(LOGLVL_DEBUG, LOGCOMP_SSL, __FILE__, ctx->config,
- "---\n%.*s\n-(%d)-\n",
+ "---\n%.*s\n-(%"APR_SIZE_T_FMT")-\n",
interim_len, vecs_data, interim_len);
}
@@ -1199,7 +1199,7 @@ static apr_status_t ssl_encrypt(void *ba
}
serf__log(LOGLVL_DEBUG, LOGCOMP_SSL, __FILE__, ctx->config,
- "ssl_encrypt read agg: %d %d %d %d\n", status, agg_status,
+ "ssl_encrypt read agg: %d %d %d %"APR_SIZE_T_FMT"\n",
status, agg_status,
ctx->crypt_status, *len);
if (!agg_status) {
@@ -1208,7 +1208,7 @@ static apr_status_t ssl_encrypt(void *ba
}
serf__log(LOGLVL_DEBUG, LOGCOMP_SSL, __FILE__, ctx->config,
- "ssl_encrypt finished: %d %d\n", status, *len);
+ "ssl_encrypt finished: %d %"APR_SIZE_T_FMT"\n", status, *len);
return status;
}
