From: Rainer Jung <rjung@apache.org>
Date: Mon, 16 Oct 2017 21:41:15 +0000 (+0000)
Subject: Fix format pattern (%lu => %APR_SIZE_T_FMT).
X-Git-Tag: 2.5.0-alpha~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f64affc4aac9647d25a1349674c9e51e5e325e8e;p=apache

Fix format pattern (%lu => %APR_SIZE_T_FMT).

Detected by maintainer mode compilation and GCC error:

.../modules/metadata/mod_remoteip.c:
In function 'remoteip_input_filter':
.../include/http_log.h:117:33:
error: format '%lu' expects argument of type
'long unsigned int', but argument 8 has type
'apr_size_t {aka unsigned int}' [-Werror=format=]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812332 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index d9d62a9560..9f509f50e2 100644
--- a/modules/metadata/mod_remoteip.c
+++ b/modules/metadata/mod_remoteip.c
@@ -1149,8 +1149,9 @@ static apr_status_t remoteip_input_filter(ap_filter_t *f,
     if (ctx->rcvd > ctx->need || !APR_BRIGADE_EMPTY(ctx->bb)) {
         ap_log_cerror(APLOG_MARK, APLOG_ERR, 0, f->c, APLOGNO(03513)
                       "RemoteIPProxyProtocol: internal error: have data left over; "
-                      " need=%lu, rcvd=%lu, brigade-empty=%d", ctx->need,
-                      ctx->rcvd, APR_BRIGADE_EMPTY(ctx->bb));
+                      " need=%" APR_SIZE_T_FMT ", rcvd=%" APR_SIZE_T_FMT
+                      ", brigade-empty=%d", ctx->need, ctx->rcvd,
+                      APR_BRIGADE_EMPTY(ctx->bb));
         f->c->aborted = 1;
         apr_brigade_destroy(ctx->bb);
         return APR_ECONNABORTED;