Ticket #3054: mutt-5370-hg.patch

File mutt-5370-hg.patch, 1.2 kB (added by m-a, 8 months ago)

Same patch as inline with the report, for convenience.

  • rfc3676.c 

    # HG changeset patch
# User Matthias Andree <matthias.andree@gmx.de>
# Date 1210495963 -7200
# Branch HEAD
# Node ID 09b0363cdf54c414fc7a94b8034ea67b242ab439
# Parent  98c39c5187a957c12ee99a0d7322634723f1e866
In debug output, cast size_t arguments to long for consistency with
printf %ld argument.

diff -r 98c39c5187a9 -r 09b0363cdf54 rfc3676.c
    a b  
    101101 
    102102  width = quote_width (s, ql); 
    103103 
    104   dprint (4, (debugfile, "f-f: line [%s], width = %ld\n", NONULL(line), width)); 
     104  dprint (4, (debugfile, "f-f: line [%s], width = %ld\n", NONULL(line), (long)width)); 
    105105 
    106106  for (p = (char *)line, words = 0; (p = strsep (&line, " ")) != NULL ; ) 
    107107  { 
    108108    w = mutt_strwidth (NONULL(p)); 
    109     dprint (4, (debugfile, "f-f: word [%s], width = %ld, line = %ld\n", NONULL(p), w, *sofar)); 
     109    dprint (4, (debugfile, "f-f: word [%s], width = %ld, line = %ld\n", NONULL(p), (long)w, (long)*sofar)); 
    110110    if (w + 1 + (*sofar) > width) 
    111111    { 
    112112      /* line would be too long, flush */ 
    113       dprint (4, (debugfile, "f-f: width: %ld\n", *sofar)); 
     113      dprint (4, (debugfile, "f-f: width: %ld\n", (long)*sofar)); 
    114114      state_puts (" \n", s); 
    115115      *sofar = 0; 
    116116    }