From: Stefan Eissing <icing@apache.org>
Date: Mon, 18 Jan 2016 15:24:10 +0000 (+0000)
Subject: better formatting of apr_utin64_t log output
X-Git-Tag: 2.5.0-alpha~2401
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=036c8322fa5f9b0609acf8627940703880f9c6a9;p=thirdparty%2Fapache%2Fhttpd.git

better formatting of apr_utin64_t log output

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

diff --git a/modules/http2/h2_push.c b/modules/http2/h2_push.c
index 905f559527b..52f29f3d426 100644
--- a/modules/http2/h2_push.c
+++ b/modules/http2/h2_push.c
@@ -625,7 +625,7 @@ static void h2_push_diary_append(h2_push_diary *diary, h2_push_diary_entry *e)
         *ne = *e;
     }
     ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, diary->entries->pool,
-                  "push_diary_append: %lx", ne->hash);
+                  "push_diary_append: %"APR_UINT64_T_HEX_FMT, ne->hash);
 }
 
 apr_array_header_t *h2_push_diary_update(h2_session *session, apr_array_header_t *pushes)
@@ -788,8 +788,9 @@ static apr_status_t gset_encode_next(gset_encoder *encoder, apr_uint64_t pval)
     encoder->last = pval;
     flex_bits = (delta >> encoder->fixed_bits);
     ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, encoder->pool,
-                  "h2_push_diary_enc: val=%lx, delta=%lx flex_bits=%ld, "
-                  "fixed_bits=%d, fixed_val=%lx", 
+                  "h2_push_diary_enc: val=%"APR_UINT64_T_HEX_FMT", delta=%"
+                  APR_UINT64_T_HEX_FMT" flex_bits=%ld, "
+                  "fixed_bits=%d, fixed_val=%"APR_UINT64_T_HEX_FMT, 
                   pval, delta, flex_bits, encoder->fixed_bits, delta&encoder->fixed_mask);
     for (; flex_bits != 0; --flex_bits) {
         status = gset_encode_bit(encoder, 1);
@@ -951,7 +952,8 @@ static apr_status_t gset_decode_next(gset_decoder *decoder, apr_uint64_t *phash)
     decoder->last_val = *phash;
     
     ap_log_perror(APLOG_MARK, GCSLOG_LEVEL, 0, decoder->pool,
-                  "h2_push_diary_digest_dec: val=%lx, delta=%lx, flex=%d, fixed=%lx", 
+                  "h2_push_diary_digest_dec: val=%"APR_UINT64_T_HEX_FMT", delta=%"
+                  APR_UINT64_T_HEX_FMT", flex=%d, fixed=%"APR_UINT64_T_HEX_FMT, 
                   *phash, delta, (int)flex, fixed);
                   
     return APR_SUCCESS;