INN commit: branches/2.5 (4 files)

INN Commit rra at isc.org
Sun Nov 15 09:25:49 UTC 2009


    Date: Sunday, November 15, 2009 @ 01:25:49
  Author: iulius
Revision: 8782

* Update the prototype of the function for keyword generation
code when INN is compiled without that support.

* Add two new files for the test suite in the MANIFEST file.

* Fix two gcc 4.4 cast warnings.

Modified:
  branches/2.5/MANIFEST
  branches/2.5/backends/cvtbatch.c
  branches/2.5/frontends/ovdb_server.c
  branches/2.5/innd/keywords.c

-------------------------+
 MANIFEST                |    4 +++-
 backends/cvtbatch.c     |    2 +-
 frontends/ovdb_server.c |    2 +-
 innd/keywords.c         |    3 +--
 4 files changed, 6 insertions(+), 5 deletions(-)

Modified: MANIFEST
===================================================================
--- MANIFEST	2009-11-15 09:24:59 UTC (rev 8781)
+++ MANIFEST	2009-11-15 09:25:49 UTC (rev 8782)
@@ -798,9 +798,11 @@
 tests/data/config/symlink             Symlink target for recursion testing
 tests/data/config/valid               Various valid config parameters
 tests/data/config/warn-bool           Invalid boolean parameters
-tests/data/config/warn-int            Invalid integer parameters
+tests/data/config/warn-int            Invalid signed integer parameters
+tests/data/config/warn-list           Invalid list parameters
 tests/data/config/warn-real           Invalid real parameters
 tests/data/config/warn-string         Invalid string parameters
+tests/data/config/warn-uint           Invalid unsigned integer parameters
 tests/data/config/warnings            Various config files with warnings
 tests/data/db                         Skeleton database for testing (Directory)
 tests/data/db/active                  Skeleton active file for testing

Modified: backends/cvtbatch.c
===================================================================
--- backends/cvtbatch.c	2009-11-15 09:24:59 UTC (rev 8781)
+++ backends/cvtbatch.c	2009-11-15 09:25:49 UTC (rev 8782)
@@ -107,7 +107,7 @@
 	    case FEED_BYTESIZE:
 		if (Dirty)
 		    putchar(' ');
-		printf("%d", len);
+		printf("%lu", (unsigned long)len);
 		break;
 	    case FEED_FULLNAME:
 	    case FEED_NAME:

Modified: frontends/ovdb_server.c
===================================================================
--- frontends/ovdb_server.c	2009-11-15 09:24:59 UTC (rev 8781)
+++ frontends/ovdb_server.c	2009-11-15 09:25:49 UTC (rev 8782)
@@ -536,7 +536,7 @@
 
 	for(i = 0; i < numreaders; i++) {
 	    if(readertab[i].mode == MODE_CLOSED
-		  || readertab[i].lastactive + CLIENT_TIMEOUT < now) {
+		  || (time_t) (readertab[i].lastactive + CLIENT_TIMEOUT) < now) {
 	    	delclient(i);
 		numreaders--;
 		i--;

Modified: innd/keywords.c
===================================================================
--- innd/keywords.c	2009-11-15 09:24:59 UTC (rev 8781)
+++ innd/keywords.c	2009-11-15 09:25:49 UTC (rev 8782)
@@ -27,8 +27,7 @@
 #if !DO_KEYWORDS
 void
 KEYgenerate(HDRCONTENT *header UNUSED, const char *body UNUSED,
-            size_t bodylen UNUSED, const char *orig UNUSED,
-            size_t length UNUSED)
+            size_t bodylen UNUSED)
 {
 }
 




More information about the inn-committers mailing list