Re: [PATCH] mod_deflate: hardcoded "%ld" -> APR_OFF_T_FMT

2018-12-23 Thread Stefan Sperling 
On Sun, Dec 23, 2018 at 02:32:30PM +0100, Yann Ylavic wrote:
> Thanks Stefan, I didn't notice before in your proposed patch, but it
> looks like uint64_t casts should be apr_uint64_t too.
> 
> Regards,
> Yann.

Right. I went ahead and fixed it in r1849630.

Thanks,
Stefan

Re: [PATCH] mod_deflate: hardcoded "%ld" -> APR_OFF_T_FMT

2018-12-23 Thread Yann Ylavic 
On Sun, Dec 23, 2018 at 10:33 AM Stefan Sperling  wrote:
>
> On Wed, Dec 19, 2018 at 07:03:39PM +0100, Stefan Sperling wrote:
> > On Wed, Dec 19, 2018 at 02:58:28PM +0100, Yann Ylavic wrote:
> > > On Wed, Dec 19, 2018 at 9:53 AM Stefan Sperling  wrote:
> > > >
> > > > On Tue, Dec 18, 2018 at 12:29:18AM +0100, Yann Ylavic wrote:
> > > > > But yes, upcast is better, while at it I'd go for uint64_t...
> > > >
> > > > Like this?
> > >
> > > I think APR_UINT64_T_FMT/apr_uint64_t would be more portable ;)
> > >
> > > Thanks for taking care of this !
> >
> > Sure :)
>
> Committed.

Thanks Stefan, I didn't notice before in your proposed patch, but it
looks like uint64_t casts should be apr_uint64_t too.

Regards,
Yann.

Re: [PATCH] mod_deflate: hardcoded "%ld" -> APR_OFF_T_FMT

2018-12-23 Thread Stefan Sperling 
On Wed, Dec 19, 2018 at 07:03:39PM +0100, Stefan Sperling wrote:
> On Wed, Dec 19, 2018 at 02:58:28PM +0100, Yann Ylavic wrote:
> > On Wed, Dec 19, 2018 at 9:53 AM Stefan Sperling  wrote:
> > >
> > > On Tue, Dec 18, 2018 at 12:29:18AM +0100, Yann Ylavic wrote:
> > > > But yes, upcast is better, while at it I'd go for uint64_t...
> > >
> > > Like this?
> > 
> > I think APR_UINT64_T_FMT/apr_uint64_t would be more portable ;)
> > 
> > Thanks for taking care of this !
> 
> Sure :)

Committed.
 
> Index: modules/filters/mod_deflate.c
> ===
> --- modules/filters/mod_deflate.c (revision 1849274)
> +++ modules/filters/mod_deflate.c (working copy)
> @@ -893,8 +893,10 @@ static apr_status_t deflate_out_filter(ap_filter_t
> f->c->bucket_alloc);
>  APR_BRIGADE_INSERT_TAIL(ctx->bb, b);
>  ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01384)
> -  "Zlib: Compressed %ld to %ld : URL %s",
> -  ctx->stream.total_in, ctx->stream.total_out, 
> r->uri);
> +  "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);
>  
>  /* leave notes for logging */
>  if (c->note_input_name) {
> @@ -1438,9 +1440,10 @@ static apr_status_t deflate_in_filter(ap_filter_t
>  ctx->validation_buffer_length += valid;
>  
>  ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01393)
> -  "Zlib: Inflated %ld to %ld : URL %s",
> -  ctx->stream.total_in, ctx->stream.total_out,
> -  r->uri);
> +  "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);
>  
>  consume_buffer(ctx, c, c->bufferSize - ctx->stream.avail_out,
> UPDATE_CRC, ctx->proc_bb);
> @@ -1459,9 +1462,10 @@ static apr_status_t deflate_in_filter(ap_filter_t
>  if ((ctx->stream.total_out & 0x) != compLen) {
>  inflateEnd(>stream);
>  ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, 
> APLOGNO(01395)
> -  "Zlib: Length %ld of inflated data 
> does "
> -  "not match expected value %ld",
> -  ctx->stream.total_out, compLen);
> +  "Zlib: Length %" APR_UINT64_T_FMT
> +  " of inflated data does not match"
> +  " expected value %ld",
> +  (uint64_t)ctx->stream.total_out, 
> compLen);
>  return APR_EGENERAL;
>  }
>  }
> @@ -1628,8 +1632,10 @@ static apr_status_t inflate_out_filter(ap_filter_t
>   */
>  flush_libz_buffer(ctx, c, inflate, Z_SYNC_FLUSH, UPDATE_CRC);
>  ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01398)
> -  "Zlib: Inflated %ld to %ld : URL %s",
> -  ctx->stream.total_in, ctx->stream.total_out, 
> r->uri);
> +  "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);
>  
>  if (ctx->validation_buffer_length == VALIDATION_SIZE) {
>  unsigned long compCRC, compLen;