Cleaning global variables from innd

[Alex Kiernan]

I cleaned out a bunch which were dead the other day, but I'd like to
move a couple more into ARTDATA as I'd like to start playing and see
if I can't make some of innd thread straightforwardly.

Does this look OK to everyone? I can't easily test it at the moment...

Index: art.c
===================================================================
RCS file: /dist1/cvs/isc/inn/inn/innd/art.c,v
retrieving revision 1.206
diff -u -r1.206 art.c
--- art.c	2003/02/11 06:48:54	1.206
+++ art.c	2003/02/12 14:42:32
@@ -439,7 +439,7 @@
   for (p = Article->data + cp->Start, j = 0 ; j < i ; j++) {
     switch (hp[j].index) {
       case HDR__PATH:
-	if (!Hassamepath || AddAlias) {
+	if (!data->Hassamepath || data->AddAlias) {
 	  /* write heading data */
 	  iov[iovcnt].iov_base = (char *) p;
 	  iov[iovcnt++].iov_len = HDR(HDR__PATH) - p;
@@ -448,7 +448,7 @@
 	  iov[iovcnt].iov_base = Path.data;
 	  iov[iovcnt++].iov_len = Path.used;
 	  arth.len += Path.used;
-	  if (AddAlias) {
+	  if (data->AddAlias) {
 	    iov[iovcnt].iov_base = Pathalias.data;
 	    iov[iovcnt++].iov_len = Pathalias.used;
 	    arth.len += Pathalias.used;
@@ -1836,14 +1836,14 @@
   }
 
   if (strncmp(Path.data, hops[0], Path.used - 1) == 0)
-    Hassamepath = true;
+    data->Hassamepath = true;
   else
-    Hassamepath = false;
+    data->Hassamepath = false;
   if (Pathalias.data != NULL &&
     !ListHas((const char **)hops, (const char *)innconf->pathalias))
-    AddAlias = true;
+    data->AddAlias = true;
   else
-    AddAlias = false;
+    data->AddAlias = false;
 
   /* And now check the path for unwanted sites -- Andy */
   for(j = 0 ; ME.Exclusions && ME.Exclusions[j] ; j++) {
Index: innd.c
===================================================================
RCS file: /dist1/cvs/isc/inn/inn/innd/innd.c,v
retrieving revision 1.97
diff -u -r1.97 innd.c
--- innd.c	2003/02/11 06:48:55	1.97
+++ innd.c	2003/02/12 14:42:32
@@ -549,8 +549,8 @@
     }
     syslog(L_NOTICE, "%s descriptors %d", LogName, i);
     if (MaxOutgoing == 0) {
-	/* getfdlimit() - (stdio + dbz + cc + lc + rc + art + Overfdcount + fudge) */
-	MaxOutgoing = i - (  3   +  3  +  2 +  1 +  1 +  1  + Overfdcount +  2  );
+	/* getfdlimit() - (stdio + dbz + cc + lc + rc + art + fudge) */
+	MaxOutgoing = i - (  3   +  3  +  2 +  1 +  1 +  1  +  2  );
 	syslog(L_NOTICE, "%s outgoing %d", LogName, MaxOutgoing);
     }
 
Index: innd.h
===================================================================
RCS file: /dist1/cvs/isc/inn/inn/innd/innd.h,v
retrieving revision 1.97
diff -u -r1.97 innd.h
--- innd.h	2003/02/11 06:48:55	1.97
+++ innd.h	2003/02/12 14:42:33
@@ -237,6 +237,9 @@
 					   it indicates offset from bp->Data */
   HDRCONTENT	  HdrContent[MAX_ARTHEADER];
 					/* includes system headers info */
+  bool            AddAlias;             /* Whether Pathalias should be added
+                                           to this article */
+  bool            Hassamepath;          /* Whether this article matches Path */
 } ARTDATA;
 
 /*
@@ -562,7 +565,6 @@
 extern bool		NNRPTracing;
 extern bool		StreamingOff;
 extern bool		Tracing;
-EXTERN int		Overfdcount;
 EXTERN struct buffer	Path;
 EXTERN struct buffer	Pathalias;
 EXTERN char	     *  ModeReason;	/* NNTP reject message   */
@@ -587,8 +589,6 @@
 EXTERN struct timeval	TimeOut;
 EXTERN TIMEINFO		Now;		/* Reasonably accurate time     */
 EXTERN bool		ThrottledbyIOError;
-EXTERN bool		AddAlias;
-EXTERN bool		Hassamepath;
 EXTERN char	    *   NCgreeting;
 EXTERN struct history   *History;
 
Index: site.c
===================================================================
RCS file: /dist1/cvs/isc/inn/inn/innd/site.c,v
retrieving revision 1.48
diff -u -r1.48 site.c
--- site.c	2003/01/19 19:40:23	1.48
+++ site.c	2003/02/12 14:42:33
@@ -390,9 +390,9 @@
 	case FEED_PATH:
 	    if (Dirty)
 		buffer_append(bp, ITEMSEP, strlen(ITEMSEP));
-	    if (!Hassamepath)
+	    if (!Data->Hassamepath)
 		buffer_append(bp, Path.data, Path.used);
-	    if (AddAlias)
+	    if (Data->AddAlias)
 		buffer_append(bp, Pathalias.data, Pathalias.used);
 	    buffer_append(bp, HDR(HDR__PATH), HDR_LEN(HDR__PATH));
 	    break;

-- 
Alex Kiernan, Principal Engineer, Development, THUS plc