Commit 81c0de89 authored by Stefan Sperling's avatar Stefan Sperling
Browse files

Use apr_uint64_t instead of uint64_t; Pointed out by ylavic 


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

modules/filters/mod_deflate.c

+7 −7
Changes for modules/filters/mod_deflate.c: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -895,8 +895,8 @@ static apr_status_t deflate_out_filter(ap_filter_t *f, 
            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01384)

                          "Zlib: Compressed %" APR_UINT64_T_FMT

                          " to %" APR_UINT64_T_FMT " : URL %s",

                          (uint64_t)ctx->stream.total_in,

                          (uint64_t)ctx->stream.total_out, r->uri);

                          (apr_uint64_t)ctx->stream.total_in,

                          (apr_uint64_t)ctx->stream.total_out, r->uri);



            /* leave notes for logging */

            if (c->note_input_name) {
@@ -1442,8 +1442,8 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, 
                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01393)

                              "Zlib: Inflated %" APR_UINT64_T_FMT

                              " to %" APR_UINT64_T_FMT " : URL %s",

                              (uint64_t)ctx->stream.total_in,

                              (uint64_t)ctx->stream.total_out, r->uri);

                              (apr_uint64_t)ctx->stream.total_in,

                              (apr_uint64_t)ctx->stream.total_out, r->uri);



                consume_buffer(ctx, c, c->bufferSize - ctx->stream.avail_out,

                               UPDATE_CRC, ctx->proc_bb);
@@ -1465,7 +1465,7 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, 
                                      "Zlib: Length %" APR_UINT64_T_FMT

                                      " of inflated data does not match"

                                      " expected value %ld",

                                      (uint64_t)ctx->stream.total_out, compLen);

                                      (apr_uint64_t)ctx->stream.total_out, compLen);

                        return APR_EGENERAL;

                    }

                }
@@ -1634,8 +1634,8 @@ static apr_status_t inflate_out_filter(ap_filter_t *f, 
            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01398)

                          "Zlib: Inflated %" APR_UINT64_T_FMT 

                          " to %" APR_UINT64_T_FMT " : URL %s",

                          (uint64_t)ctx->stream.total_in,

                          (uint64_t)ctx->stream.total_out, r->uri);

                          (apr_uint64_t)ctx->stream.total_in,

                          (apr_uint64_t)ctx->stream.total_out, r->uri);



            if (ctx->validation_buffer_length == VALIDATION_SIZE) {

                unsigned long compCRC, compLen;