INN commit: trunk (6 files)

[INN Commit]

    Date: Thursday, August 23, 2007 @ 04:33:14
  Author: iulius
Revision: 7655

Convert some size_t values to properly compile on FreeBSD amd64.

Modified:
  trunk/backends/batcher.c
  trunk/innd/innd.c
  trunk/innd/nc.c
  trunk/innfeed/endpoint.c
  trunk/lib/innconf.c
  trunk/storage/timecaf/caf.c

-----------------------+
 backends/batcher.c    |    5 +++--
 innd/innd.c           |    4 ++--
 innd/nc.c             |    4 ++--
 innfeed/endpoint.c    |    2 +-
 lib/innconf.c         |    3 ++-
 storage/timecaf/caf.c |    5 +++--
 6 files changed, 13 insertions(+), 10 deletions(-)

Modified: backends/batcher.c
===================================================================
--- backends/batcher.c	2007-08-22 13:11:37 UTC (rev 7654)
+++ backends/batcher.c	2007-08-23 11:33:14 UTC (rev 7655)
@@ -102,8 +102,9 @@
 
     notice("batcher %s times user %.3f system %.3f elapsed %.3f",
            Host, usertime, systime, STATend - STATbegin);
-    notice("batcher %s stats batches %d articles %d bytes %lu",
-           Host, BATCHcount, ArtsWritten, (unsigned long) BytesWritten);
+    notice("batcher %s stats batches %d articles %lu bytes %lu",
+           Host, BATCHcount, (unsigned long) ArtsWritten,
+           (unsigned long) BytesWritten);
 
     /* Last batch exit okay? */
     if (BATCHstatus == 0) {

Modified: innd/innd.c
===================================================================
--- innd/innd.c	2007-08-22 13:11:37 UTC (rev 7654)
+++ innd/innd.c	2007-08-23 11:33:14 UTC (rev 7655)
@@ -187,8 +187,8 @@
     if (why)
         syslog(LOG_WARNING, "SERVER shutdown %s", why);
     else
-        syslog(LOG_WARNING, "SERVER shutdown received signal %d",
-               killer_signal);
+        syslog(LOG_WARNING, "SERVER shutdown received signal %lu",
+               (unsigned long) killer_signal);
     exit(status);
 }
 

Modified: innd/nc.c
===================================================================
--- innd/nc.c	2007-08-22 13:11:37 UTC (rev 7654)
+++ innd/nc.c	2007-08-23 11:33:14 UTC (rev 7655)
@@ -962,8 +962,8 @@
 	  cp->Argument = NULL;
 	}
 	i += cp->LargeCmdSize;
-	syslog(L_NOTICE, "%s internal rejecting too long command line (%d > %d)",
-	  CHANname(cp), i, NNTP_STRLEN);
+	syslog(L_NOTICE, "%s internal rejecting too long command line (%lu > %d)",
+	  CHANname(cp), (unsigned long) i, NNTP_STRLEN);
 	cp->LargeCmdSize = 0;
 	snprintf(buff, sizeof(buff), "%d command exceeds limit of %d bytes",
                  NNTP_ERR_COMMAND, NNTP_STRLEN);

Modified: innfeed/endpoint.c
===================================================================
--- innfeed/endpoint.c	2007-08-22 13:11:37 UTC (rev 7654)
+++ innfeed/endpoint.c	2007-08-23 11:33:14 UTC (rev 7655)
@@ -231,7 +231,7 @@
       static bool sizelogged = false ;
           
 #if defined (FD_SETSIZE)
-      if (fd >= FD_SETSIZE)
+      if ((unsigned int) fd >= FD_SETSIZE)
         {
           sizelogged = true ;
           warn ("ME fd (%d) looks too big (%d -- FD_SETSIZE)", fd,

Modified: lib/innconf.c
===================================================================
--- lib/innconf.c	2007-08-22 13:11:37 UTC (rev 7654)
+++ lib/innconf.c	2007-08-23 11:33:14 UTC (rev 7655)
@@ -699,7 +699,8 @@
         print_string(file, config_table[i].name, string_val, quoting);
         break;
     default:
-        die("internal error: invalid type in row %d of config table", i);
+        die("internal error: invalid type in row %lu of config table",
+            (unsigned long) i);
         break;
     }
 }

Modified: storage/timecaf/caf.c
===================================================================
--- storage/timecaf/caf.c	2007-08-22 13:11:37 UTC (rev 7654)
+++ storage/timecaf/caf.c	2007-08-23 11:33:14 UTC (rev 7655)
@@ -1620,8 +1620,9 @@
 #endif    
 
     if (verbose) {
-	printf("Am  cleaning %s: Free=%d (%f%%) %s\n", path, head.Free,
-	       percentfree, toc_needs_expansion ? "(Expanding TOC)" : "");
+	printf("Am  cleaning %s: Free=%lu (%f%%) %s\n", path,
+	       (unsigned long) head.Free, percentfree,
+	       toc_needs_expansion ? "(Expanding TOC)" : "");
     }
 
     /* decide on proper size for new TOC */