inn-kill_warnings.patch

   1 diff -dur inn-2.4.1.orig/authprogs/smbval/rfcnb-common.h inn-2.4.1/authprogs/smbval/rfcnb-common.h
   2 --- inn-2.4.1.orig/authprogs/smbval/rfcnb-common.h      2004-01-07 23:47:19.000000000 +0100
   3 +++ inn-2.4.1/authprogs/smbval/rfcnb-common.h   2004-02-06 13:59:33.784923464 +0100
   4 @@ -34,3 +34,4 @@
   5  } RFCNB_Pkt;
   6
   7
   8 +void RFCNB_Free_Pkt(struct RFCNB_Pkt *pkt);
   9 diff -dur inn-2.4.1.orig/authprogs/smbval/rfcnb.h inn-2.4.1/authprogs/smbval/rfcnb.h
  10 --- inn-2.4.1.orig/authprogs/smbval/rfcnb.h     2004-01-07 23:47:19.000000000 +0100
  11 +++ inn-2.4.1/authprogs/smbval/rfcnb.h  2004-02-06 13:59:26.203076080 +0100
  12 @@ -47,4 +47,3 @@
  13
  14  struct RFCNB_Pkt *RFCNB_Alloc_Pkt(int n);
  15
  16 -void RFCNB_Free_Pkt(struct RFCNB_Pkt *pkt);
  17 diff -dur inn-2.4.1.orig/backends/innxmit.c inn-2.4.1/backends/innxmit.c
  18 --- inn-2.4.1.orig/backends/innxmit.c   2004-01-07 23:47:19.000000000 +0100
  19 +++ inn-2.4.1/backends/innxmit.c        2004-02-06 13:57:42.058908400 +0100
  20 @@ -590,7 +590,7 @@
  21         vec[0].iov_base = (char *) art->data;
  22         vec[0].iov_len = len;
  23         /* Add 14 bytes, which maybe will be the length of the Bytes header */
  24 -       snprintf(buf, sizeof(buf), "Bytes: %d\r\n", art->len + 14);
  25 +       snprintf(buf, sizeof(buf), "Bytes: %ld\r\n", (long)art->len + 14);
  26         vec[1].iov_base = buf;
  27         vec[1].iov_len = strlen(buf);
  28         if (iscmsg) {
  29 @@ -608,7 +608,7 @@
  30      if (GotInterrupt)
  31         Interrupted(Article, MessageID);
  32      if (Debug) {
  33 -       fprintf(stderr, "> [ article %d ]\n", art->len);
  34 +       fprintf(stderr, "> [ article %ld ]\n", (long)art->len);
  35         fprintf(stderr, "> .\n");
  36      }
  37
  38 diff -dur inn-2.4.1.orig/expire/expireover.c inn-2.4.1/expire/expireover.c
  39 --- inn-2.4.1.orig/expire/expireover.c  2004-02-06 13:11:27.000000000 +0100
  40 +++ inn-2.4.1/expire/expireover.c       2004-02-06 13:57:42.058908400 +0100
  41 @@ -15,6 +15,7 @@
  42  #include <grp.h>
  43  #include <signal.h>
  44  #include <syslog.h>
  45 +#include <time.h>
  46
  47  #include "inn/innconf.h"
  48  #include "inn/messages.h"
  49 diff -dur inn-2.4.1.orig/expire/makehistory.c inn-2.4.1/expire/makehistory.c
  50 --- inn-2.4.1.orig/expire/makehistory.c 2004-02-06 13:11:27.000000000 +0100
  51 +++ inn-2.4.1/expire/makehistory.c      2004-02-06 13:57:42.059908248 +0100
  52 @@ -543,7 +543,7 @@
  53              fp->HeaderLength = p - fp->Header - 1;
  54         } else if (RetrMode == RETR_ALL && strcmp(fp->Headername, "Bytes") == 0)
  55         {
  56 -               snprintf(bytes, sizeof(bytes), "%d", art->len);
  57 +               snprintf(bytes, sizeof(bytes), "%ld", (long)art->len);
  58                 fp->HasHeader = true;
  59                 fp->Header = bytes;
  60                 fp->HeaderLength = strlen(bytes);
  61 diff -dur inn-2.4.1.orig/frontends/ovdb_init.c inn-2.4.1/frontends/ovdb_init.c
  62 --- inn-2.4.1.orig/frontends/ovdb_init.c        2004-01-07 23:47:19.000000000 +0100
  63 +++ inn-2.4.1/frontends/ovdb_init.c     2004-02-06 13:57:42.059908248 +0100
  64 @@ -113,7 +113,6 @@
  65      char group[MAXHEADERSIZE];
  66      u_int32_t v2 = 2;
  67      int ret;
  68 -    char *p;
  69
  70      notice("upgrading data to version 2");
  71      ret = open_db(&groupstats, "groupstats", DB_BTREE);
  72 diff -dur inn-2.4.1.orig/frontends/ovdb_stat.c inn-2.4.1/frontends/ovdb_stat.c
  73 --- inn-2.4.1.orig/frontends/ovdb_stat.c        2004-01-07 23:47:19.000000000 +0100
  74 +++ inn-2.4.1/frontends/ovdb_stat.c     2004-02-06 13:57:42.059908248 +0100
  75 @@ -8,6 +8,7 @@
  76  #include <errno.h>
  77  #include <signal.h>
  78  #include <syslog.h>
  79 +#include <time.h>
  80
  81  #include "inn/innconf.h"
  82  #include "inn/messages.h"
  83 @@ -167,7 +168,7 @@
  84         break;
  85      case SIZE: /* 'a' points to size_t */
  86          memcpy(&sz, cp + tab[i].a, sizeof(sz));
  87 -       sprintf(val, "%d", sz);
  88 +       sprintf(val, "%ld", (long)sz);
  89         break;
  90      case END:
  91          break;
  92 diff -dur inn-2.4.1.orig/innd/chan.c inn-2.4.1/innd/chan.c
  93 --- inn-2.4.1.orig/innd/chan.c  2004-01-07 23:47:19.000000000 +0100
  94 +++ inn-2.4.1/innd/chan.c       2004-02-06 13:57:42.060908096 +0100
  95 @@ -234,11 +234,11 @@
  96             syslog(L_NOTICE, "%s trace sleeping %ld 0x%p",
  97                 p, (long)cp->Waketime, (void *)cp->Waker);
  98         if (FD_ISSET(cp->fd, &RCHANmask))
  99 -           syslog(L_NOTICE, "%s trace reading %d %s",
 100 -               p, cp->In.used, MaxLength(cp->In.data, cp->In.data));
 101 +           syslog(L_NOTICE, "%s trace reading %ld %s",
 102 +               p, (long)cp->In.used, MaxLength(cp->In.data, cp->In.data));
 103         if (FD_ISSET(cp->fd, &WCHANmask))
 104 -           syslog(L_NOTICE, "%s trace writing %d %s",
 105 -               p, cp->Out.left, MaxLength(cp->Out.data, cp->Out.data));
 106 +           syslog(L_NOTICE, "%s trace writing %ld %s",
 107 +               p, (long)cp->Out.left, MaxLength(cp->Out.data, cp->Out.data));
 108      }
 109  }
 110
 111 @@ -311,7 +311,7 @@
 112         } else if (cp->Type == CTreject)
 113             syslog(L_NOTICE, "%s %ld", name, cp->Rejected);
 114         else if (cp->Out.left)
 115 -           syslog(L_NOTICE, "%s closed lost %d", name, cp->Out.left);
 116 +           syslog(L_NOTICE, "%s closed lost %ld", name, (long)cp->Out.left);
 117         else
 118             syslog(L_NOTICE, "%s closed", name);
 119         WCHANremove(cp);
 120 @@ -390,8 +390,8 @@
 121
 122      switch (cp->Type) {
 123      default:
 124 -       snprintf(buff, sizeof(buff), "?%d(#%d@%d)?", cp->Type, cp->fd,
 125 -                 cp - CHANtable);
 126 +       snprintf(buff, sizeof(buff), "?%d(#%d@%ld)?", cp->Type, cp->fd,
 127 +                 (long)(cp - CHANtable));
 128         break;
 129      case CTany:
 130         snprintf(buff, sizeof(buff), "any:%d", cp->fd);
 131 @@ -778,13 +778,13 @@
 132      for (bp = &cp->Out; bp->left > 0; bp->left -= i, bp->used += i) {
 133         i = CHANwrite(cp->fd, &bp->data[bp->used], bp->left);
 134         if (i < 0) {
 135 -           syslog(L_ERROR, "%s cant flush count %d %m",
 136 -               CHANname(cp), bp->left);
 137 +           syslog(L_ERROR, "%s cant flush count %ld %m",
 138 +               CHANname(cp), (long)bp->left);
 139             return false;
 140         }
 141         if (i == 0) {
 142 -           syslog(L_ERROR, "%s cant flush count %d",
 143 -               CHANname(cp), bp->left);
 144 +           syslog(L_ERROR, "%s cant flush count %ld",
 145 +               CHANname(cp), (long)bp->left);
 146             return false;
 147         }
 148      }
 149 diff -dur inn-2.4.1.orig/innd/nc.c inn-2.4.1/innd/nc.c
 150 --- inn-2.4.1.orig/innd/nc.c    2004-01-07 23:47:19.000000000 +0100
 151 +++ inn-2.4.1/innd/nc.c 2004-02-06 13:57:42.061907944 +0100
 152 @@ -133,8 +133,8 @@
 153      if (i == 0) {      /* if only data then try to write directly */
 154         i = write(cp->fd, &bp->data[bp->used], bp->left);
 155         if (Tracing || cp->Tracing)
 156 -           syslog(L_TRACE, "%s NCwritereply %d=write(%d, \"%.15s\", %d)",
 157 -               CHANname(cp), i, cp->fd, &bp->data[bp->used], bp->left);
 158 +           syslog(L_TRACE, "%s NCwritereply %d=write(%d, \"%.15s\", %ld)",
 159 +               CHANname(cp), i, cp->fd, &bp->data[bp->used], (long)bp->left);
 160         if (i > 0) bp->used += i;
 161         if (bp->used == bp->left) {
 162             /* all the data was written */
 163 @@ -734,7 +734,7 @@
 164
 165    readmore = movedata = false;
 166    if (Tracing || cp->Tracing)
 167 -    syslog(L_TRACE, "%s NCproc Used=%d", CHANname(cp), cp->In.used);
 168 +    syslog(L_TRACE, "%s NCproc Used=%ld", CHANname(cp), (long)cp->In.used);
 169
 170    bp = &cp->In;
 171    if (bp->used == 0)
 172 @@ -742,8 +742,8 @@
 173
 174    for ( ; ; ) {
 175      if (Tracing || cp->Tracing) {
 176 -      syslog(L_TRACE, "%s cp->Start=%d cp->Next=%d bp->Used=%d", CHANname(cp),
 177 -       cp->Start, cp->Next, bp->used);
 178 +      syslog(L_TRACE, "%s cp->Start=%d cp->Next=%d bp->Used=%ld", CHANname(cp),
 179 +       cp->Start, cp->Next, (long)bp->used);
 180        if (bp->used > 15)
 181         syslog(L_TRACE, "%s NCproc state=%d next \"%.15s\"", CHANname(cp),
 182           cp->State, &bp->data[cp->Next]);
 183 @@ -1034,8 +1034,8 @@
 184         * directory with an unique timestamp, and start rnews on it.
 185         */
 186        if (Tracing || cp->Tracing)
 187 -       syslog(L_TRACE, "%s CSgetxbatch: now %d of %d bytes", CHANname(cp),
 188 -         bp->used, cp->XBatchSize);
 189 +       syslog(L_TRACE, "%s CSgetxbatch: now %ld of %d bytes", CHANname(cp),
 190 +         (long)bp->used, cp->XBatchSize);
 191
 192        if (cp->Next != 0) {
 193         /* data must start from the begining of the buffer */
 194 @@ -1118,8 +1118,8 @@
 195      if (cp->State == CSwritegoodbye || cp->Type == CTfree)
 196        break;
 197      if (Tracing || cp->Tracing)
 198 -      syslog(L_TRACE, "%s NCproc state=%d Start=%d Next=%d Used=%d",
 199 -       CHANname(cp), cp->State, cp->Start, cp->Next, bp->used);
 200 +      syslog(L_TRACE, "%s NCproc state=%d Start=%d Next=%d Used=%ld",
 201 +       CHANname(cp), cp->State, cp->Start, cp->Next, (long)bp->used);
 202
 203      if (movedata) { /* move data rather than extend buffer */
 204        TMRstart(TMR_DATAMOVE);
 205 @@ -1164,8 +1164,8 @@
 206      int                        i;
 207
 208      if (Tracing || cp->Tracing)
 209 -       syslog(L_TRACE, "%s NCreader Used=%d",
 210 -           CHANname(cp), cp->In.used);
 211 +       syslog(L_TRACE, "%s NCreader Used=%ld",
 212 +           CHANname(cp), (long)cp->In.used);
 213
 214      /* Read any data that's there; ignore errors (retry next time it's our
 215       * turn) and if we got nothing, then it's EOF so mark it closed. */
 216 diff -dur inn-2.4.1.orig/innd/site.c inn-2.4.1/innd/site.c
 217 --- inn-2.4.1.orig/innd/site.c  2004-01-07 23:47:19.000000000 +0100
 218 +++ inn-2.4.1/innd/site.c       2004-02-06 13:57:42.062907792 +0100
 219 @@ -198,8 +198,8 @@
 220          i = write(fd, &sp->Channel->Out.data[sp->Channel->Out.used],
 221                    sp->Channel->Out.left);
 222          if(i <= 0) {
 223 -            syslog(L_ERROR,"%s cant spool count %d", CHANname(sp->Channel),
 224 -                sp->Channel->Out.left);
 225 +            syslog(L_ERROR,"%s cant spool count %ld", CHANname(sp->Channel),
 226 +                (long)sp->Channel->Out.left);
 227              close(fd);
 228              return false;
 229          }
 230 @@ -502,8 +502,8 @@
 231         if (sp->FNLwantsnames) {
 232             i = strlen(sp->Param) + sp->FNLnames.used;
 233             if (i + (sizeof(TOKEN) * 2) + 3 >= sizeof buff) {
 234 -               syslog(L_ERROR, "%s toolong need %d for %s",
 235 -                   sp->Name, i + (sizeof(TOKEN) * 2) + 3, sp->Name);
 236 +               syslog(L_ERROR, "%s toolong need %ld for %s",
 237 +                   sp->Name, (long)(i + (sizeof(TOKEN) * 2) + 3), sp->Name);
 238                 break;
 239             }
 240             temp = xmalloc(i + 1);
 241 @@ -763,7 +763,7 @@
 242              * site spooling, copy any data that might be pending,
 243              * and arrange to retry later. */
 244             if (!SITEspool(sp, (CHANNEL *)NULL)) {
 245 -               syslog(L_ERROR, "%s loss %d bytes", sp->Name, cp->Out.left);
 246 +               syslog(L_ERROR, "%s loss %ld bytes", sp->Name, (long)cp->Out.left);
 247                 return;
 248             }
 249             WCHANsetfrombuffer(sp->Channel, &cp->Out);
 250 @@ -852,11 +852,11 @@
 251      else if (cp != NULL && cp->Out.left) {
 252         if (sp->Type == FTfile || sp->Spooling) {
 253             /* Can't flush a file?  Hopeless. */
 254 -           syslog(L_ERROR, "%s dataloss %d", sp->Name, cp->Out.left);
 255 +           syslog(L_ERROR, "%s dataloss %ld", sp->Name, (long)cp->Out.left);
 256             return;
 257         }
 258         /* Must be a working channel; spool and retry. */
 259 -       syslog(L_ERROR, "%s spooling %d bytes", sp->Name, cp->Out.left);
 260 +       syslog(L_ERROR, "%s spooling %ld bytes", sp->Name, (long)cp->Out.left);
 261         if (SITEspool(sp, cp))
 262             SITEflush(sp, false);
 263         return;
 264 @@ -1140,13 +1140,13 @@
 265      case FTfile:
 266         p += strlen(strcpy(p, "file"));
 267         if (sp->Buffered) {
 268 -           sprintf(p, " buffered(%d)", sp->Buffer.left);
 269 +           sprintf(p, " buffered(%ld)", (long)sp->Buffer.left);
 270             p += strlen(p);
 271         }
 272         else if ((cp = sp->Channel) == NULL)
 273             p += strlen(strcpy(p, " no channel?"));
 274         else {
 275 -           sprintf(p, " open fd=%d, in mem %d", cp->fd, cp->Out.left);
 276 +           sprintf(p, " open fd=%d, in mem %ld", cp->fd, (long)cp->Out.left);
 277             p += strlen(p);
 278         }
 279         break;
 280 @@ -1165,7 +1165,7 @@
 281         if ((cp = sp->Channel) == NULL)
 282             p += strlen(strcpy(p, " no channel?"));
 283         else {
 284 -           sprintf(p, " fd=%d, in mem %d", cp->fd, cp->Out.left);
 285 +           sprintf(p, " fd=%d, in mem %ld", cp->fd, (long)cp->Out.left);
 286             p += strlen(p);
 287         }
 288         break;
 289 diff -dur inn-2.4.1.orig/innfeed/article.c inn-2.4.1/innfeed/article.c
 290 --- inn-2.4.1.orig/innfeed/article.c    2004-01-07 23:47:19.000000000 +0100
 291 +++ inn-2.4.1/innfeed/article.c 2004-02-06 13:57:42.062907792 +0100
 292 @@ -639,7 +639,7 @@
 293         if ((amtToRead + bytesInUse) > maxBytesInUse && maxLimitNotified == false) {
 294             maxLimitNotified = true ;
 295              notice ("ME exceeding maximum article byte limit: %d (max),"
 296 -                    " %d (cur)", maxBytesInUse, amtToRead + bytesInUse) ;
 297 +                    " %ld (cur)", maxBytesInUse, (long)(amtToRead + bytesInUse)) ;
 298         }
 299
 300         if ((article->contents = newBuffer (newBufferSize)) == NULL)
 301 diff -dur inn-2.4.1.orig/innfeed/imap_connection.c inn-2.4.1/innfeed/imap_connection.c
 302 --- inn-2.4.1.orig/innfeed/imap_connection.c    2004-01-07 23:47:19.000000000 +0100
 303 +++ inn-2.4.1/innfeed/imap_connection.c 2004-02-06 13:57:42.064907488 +0100
 304 @@ -795,7 +795,7 @@
 305      str_base = bufferBase(b);
 306      str = str_base;
 307
 308 -    while ( (((int)str) - ((int)str_base)) < size - headerlen)
 309 +    while ( (((long)str) - ((long)str_base)) < size - headerlen)
 310      {
 311         if (*str == header[0])
 312         {
 313 diff -dur inn-2.4.1.orig/innfeed/innlistener.c inn-2.4.1/innfeed/innlistener.c
 314 --- inn-2.4.1.orig/innfeed/innlistener.c        2004-01-07 23:47:19.000000000 +0100
 315 +++ inn-2.4.1/innfeed/innlistener.c     2004-02-06 13:57:42.065907336 +0100
 316 @@ -653,7 +653,7 @@
 317              {
 318                /* XXX need to remember we've gone over the limit and not try
 319                   to add any more. */
 320 -              warn ("ME internal too many hosts. (max is %d)", lis->hostLen) ;
 321 +              warn ("ME internal too many hosts. (max is %ld)", (long)lis->hostLen) ;
 322                dropArticle (peerName,article) ;
 323              }
 324            else
 325 diff -dur inn-2.4.1.orig/innfeed/tape.c inn-2.4.1/innfeed/tape.c
 326 --- inn-2.4.1.orig/innfeed/tape.c       2004-01-07 23:47:19.000000000 +0100
 327 +++ inn-2.4.1/innfeed/tape.c    2004-02-06 13:57:42.066907184 +0100
 328 @@ -486,8 +486,8 @@
 329      indent [i] = ' ' ;
 330    indent [i] = '\0' ;
 331
 332 -  fprintf (fp,"%sGlobal Tape List : (count %d) {\n",
 333 -           indent,activeTapeIdx) ;
 334 +  fprintf (fp,"%sGlobal Tape List : (count %ld) {\n",
 335 +           indent,(long)activeTapeIdx) ;
 336
 337    for (i = 0 ; i < activeTapeIdx ; i++)
 338      printTapeInfo (activeTapes [i],fp,indentAmt + INDENT_INCR) ;
 339 diff -dur inn-2.4.1.orig/lib/innconf.c inn-2.4.1/lib/innconf.c
 340 --- inn-2.4.1.orig/lib/innconf.c        2004-01-07 23:47:19.000000000 +0100
 341 +++ inn-2.4.1/lib/innconf.c     2004-02-06 13:57:42.066907184 +0100
 342 @@ -680,7 +680,7 @@
 343          print_string(file, config_table[i].name, string_val, quoting);
 344          break;
 345      default:
 346 -        die("internal error: invalid type in row %d of config table", i);
 347 +        die("internal error: invalid type in row %ld of config table", (long)i);
 348          break;
 349      }
 350  }
 351 diff -dur inn-2.4.1.orig/nnrpd/tls.c inn-2.4.1/nnrpd/tls.c
 352 --- inn-2.4.1.orig/nnrpd/tls.c  2004-01-07 23:47:19.000000000 +0100
 353 +++ inn-2.4.1/nnrpd/tls.c       2004-02-06 13:57:42.067907032 +0100
 354 @@ -67,6 +67,7 @@
 355
 356  /* outside the ifdef so `make depend` works even ifndef HAVE_SSL */
 357  #include "tls.h"
 358 +#include "sasl_config.h"
 359
 360  #ifdef HAVE_SSL
 361
 362 diff -dur inn-2.4.1.orig/nnrpd/tls.h inn-2.4.1/nnrpd/tls.h
 363 --- inn-2.4.1.orig/nnrpd/tls.h  2004-01-07 23:47:19.000000000 +0100
 364 +++ inn-2.4.1/nnrpd/tls.h       2004-02-06 13:57:42.067907032 +0100
 365 @@ -28,6 +28,7 @@
 366  #include <openssl/pem.h>
 367  #include <openssl/x509.h>
 368  #include <openssl/ssl.h>
 369 +#include <openssl/rand.h>
 370
 371  /* init tls engine */
 372  int tls_init_serverengine(int verifydepth, /* depth to verify */
 373 diff -dur inn-2.4.1.orig/storage/cnfs/cnfs.c inn-2.4.1/storage/cnfs/cnfs.c
 374 --- inn-2.4.1.orig/storage/cnfs/cnfs.c  2004-01-07 23:47:19.000000000 +0100
 375 +++ inn-2.4.1/storage/cnfs/cnfs.c       2004-02-06 13:57:42.068906880 +0100
 376 @@ -375,8 +375,8 @@
 377    len = strtoul(l, NULL, 10) * (off_t)1024;    /* This value in KB in decimal */
 378    if (S_ISREG(sb.st_mode) && len != sb.st_size) {
 379      if (sizeof(CYCBUFFEXTERN) > (size_t) sb.st_size) {
 380 -      syslog(L_NOTICE, "%s: length must be at least '%u' for '%s' cycbuff(%ld bytes)",
 381 -       LocalLogName, sizeof(CYCBUFFEXTERN), cycbuff->name, (long)sb.st_size);
 382 +      syslog(L_NOTICE, "%s: length must be at least '%lu' for '%s' cycbuff(%ld bytes)",
 383 +       LocalLogName, (unsigned long)sizeof(CYCBUFFEXTERN), cycbuff->name, (long)sb.st_size);
 384        free(cycbuff);
 385        return false;
 386      }
 387 diff -dur inn-2.4.1.orig/storage/overdata.c inn-2.4.1/storage/overdata.c
 388 --- inn-2.4.1.orig/storage/overdata.c   2004-01-07 23:47:19.000000000 +0100
 389 +++ inn-2.4.1/storage/overdata.c        2004-02-06 13:57:42.068906880 +0100
 390 @@ -174,7 +174,7 @@
 391      for (field = 0; field < ARRAY_SIZE(fields); field++) {
 392          buffer_append(overview, "\t", 1);
 393          if (field == 5) {
 394 -            snprintf(buffer, sizeof(buffer), "%u", length);
 395 +            snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)length);
 396              buffer_append(overview, buffer, strlen(buffer));
 397          } else
 398              build_header(article, length, fields[field], overview);
 399 diff -dur inn-2.4.1.orig/storage/timecaf/caf.c inn-2.4.1/storage/timecaf/caf.c
 400 --- inn-2.4.1.orig/storage/timecaf/caf.c        2004-02-06 13:11:27.000000000 +0100
 401 +++ inn-2.4.1/storage/timecaf/caf.c     2004-02-06 13:57:42.069906728 +0100
 402 @@ -1518,7 +1518,7 @@
 403             CAFTOCENT *tocp2;
 404
 405             if (verbose) {
 406 -               printf("Compacting   %s: Free=%d (%f%%)\n", path, head.Free, percentfree);
 407 +               printf("Compacting   %s: Free=%ld (%f%%)\n", path, (long)head.Free, percentfree);
 408             }
 409
 410             delta = newlow - head.Low;
 411 @@ -1571,7 +1571,7 @@
 412         } else {
 413             /* need neither full cleaning nor compaction, so return. */
 414             if (verbose) {
 415 -               printf("Not cleaning %s: Free=%d (%f%%)\n", path, head.Free, percentfree);
 416 +               printf("Not cleaning %s: Free=%ld (%f%%)\n", path, (long)head.Free, percentfree);
 417             }
 418             fclose(infile);
 419             free(tocarray);
 420 @@ -1611,7 +1611,7 @@
 421  #endif
 422
 423      if (verbose) {
 424 -       printf("Am  cleaning %s: Free=%d (%f%%) %s\n", path, head.Free,
 425 +       printf("Am  cleaning %s: Free=%ld (%f%%) %s\n", path, (long)head.Free,
 426                percentfree, toc_needs_expansion ? "(Expanding TOC)" : "");
 427      }
 428