INN commit: branches/2.5 (innd/art.c innd/innd.c nnrpd/perm.c)

[INN Commit]

    Date: Saturday, August 6, 2011 @ 13:24:27
  Author: iulius
Revision: 9317

fix gcc 4.6.1 warnings about unused variables

Modified:
  branches/2.5/innd/art.c
  branches/2.5/innd/innd.c
  branches/2.5/nnrpd/perm.c

--------------+
 innd/art.c   |    9 ++++++---
 innd/innd.c  |    8 ++++++--
 nnrpd/perm.c |    7 ++++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

Modified: innd/art.c
===================================================================
--- innd/art.c	2011-08-06 20:23:13 UTC (rev 9316)
+++ innd/art.c	2011-08-06 20:24:27 UTC (rev 9317)
@@ -1949,20 +1949,23 @@
   bool		IsControl = false;
   bool		Filtered = false;
   bool          ihave;
-  struct buffer	*article;
   HASH		hash;
   TOKEN		token;
   char		*groupbuff[2];
 #if defined(DO_PERL) || defined(DO_PYTHON)
+  struct buffer *article;
   char		*filterrc;
-#endif /* defined(DO_PERL) || defined(DO_PYTHON) */
+#endif
   OVADDRESULT	result;
 
   /* Check whether we are receiving the article via IHAVE or TAKETHIS. */
   ihave = (cp->Sendid.size > 3) ? false : true;
 
+#if defined(DO_PERL) || defined(DO_PYTHON)
+  article = &cp->In;
+#endif
+
   /* Preliminary clean-ups. */
-  article = &cp->In;
   artclean = ARTclean(data, cp->Error, ihave);
 
   /* We have not parsed the Path: header yet.  We do not check for logipaddr

Modified: innd/innd.c
===================================================================
--- innd/innd.c	2011-08-06 20:23:13 UTC (rev 9316)
+++ innd/innd.c	2011-08-06 20:24:27 UTC (rev 9317)
@@ -356,14 +356,16 @@
     bool		ShouldFork;
     bool		ShouldRenumber;
     bool		ShouldSyntaxCheck;
-    bool		filter = true;
     pid_t		pid;
-#if	defined(_DEBUG_MALLOC_INC)
+#if defined(_DEBUG_MALLOC_INC)
     union malloptarg	m;
 #endif	/* defined(_DEBUG_MALLOC_INC) */
 #if DO_PERL
     char                *path1, *path2;
 #endif
+#if defined(DO_PERL) || defined(DO_PYTHON)
+    bool                filter = true;
+#endif
 
     /* Set up the pathname, first thing, and teach our error handlers about
        the name of the program. */
@@ -466,7 +468,9 @@
                                     "ed from the command line", (char *) 0);
 	    break;
 	case 'N':
+#if defined(DO_PERL) || defined(DO_PYTHON)
 	    filter = false;
+#endif
 	    break;
 	case 'n':
 	    switch (*optarg) {

Modified: nnrpd/perm.c
===================================================================
--- nnrpd/perm.c	2011-08-06 20:23:13 UTC (rev 9316)
+++ nnrpd/perm.c	2011-08-06 20:24:27 UTC (rev 9317)
@@ -625,7 +625,10 @@
 static void
 authdecl_parse(AUTHGROUP *curauth, CONFFILE *f, CONFTOKEN *tok)
 {
-    int oldtype,boolval;
+    int oldtype;
+#ifdef HAVE_SSL
+    int boolval;
+#endif
     METHOD *m;
     bool bit;
     char buff[SMBUF], *oldname, *p;
@@ -645,6 +648,7 @@
 	ReportError(f, buff);
     }
 
+#ifdef HAVE_SSL
     if (strcasecmp(tok->name, "on") == 0
         || strcasecmp(tok->name, "true") == 0
         || strcasecmp(tok->name, "yes") == 0)
@@ -655,6 +659,7 @@
 	boolval = false;
     else
 	boolval = -1;
+#endif
 
     switch (oldtype) {
       case PERMkey: