# HG changeset patch
# User bears
# Date 960877903 -3600
# Node ID f782184db8bc2a538632b731fe285cc242fcfd9c
# Parent  38b0a1532a37cbd8f493a6428178f5758119ea9d
[svn] 1.0pre6 merge plus variable rename

diff -r 38b0a1532a37 -r f782184db8bc src/client.c
--- a/src/client.c	Mon Jun 05 09:57:05 2000 +0100
+++ b/src/client.c	Tue Jun 13 07:31:43 2000 +0100
@@ -1,7 +1,7 @@
 /*
   client.c
 
-  $Id: client.c 135 2000-06-05 08:57:05Z bears $
+  $Id: client.c 142 2000-06-13 06:31:43Z bears $
 */
 
 #if HAVE_CONFIG_H
@@ -38,7 +38,7 @@
   Some newsgroups names are reserved for server-specific or server
   pseudo groups. We don't want to fetch them. For example, INN
   keeps all its control messages in a 'control' hierarchy, and
-  used the "to." heirarchy for dark and mysterious purposes I think
+  used the "to." hierarchy for dark and mysterious purposes I think
   are to do with newsfeeds. The recommended restrictions are documented
   in C.Lindsay, "News Article Format", <draft-ietf-usefor-article-03.txt>.
 */
@@ -51,7 +51,7 @@
 {
     { "*.*", FALSE },			/* Single component */
     { "control.*", TRUE },		/* control.* groups */
-    { "to.*", TRUE },			/* control.* groups */
+    { "to.*", TRUE },			/* to.* groups */
     { "*.all", TRUE },			/* 'all' as a component */
     { "*.all.*", TRUE },
     { "all.*", TRUE },
@@ -982,13 +982,13 @@
 	    if ( Prt_searchHeader( txt, "Supersedes", supersedeIds ) )
 	    {
 		ItemList *ids;
-		const char *msgId;
+		const char *supersededMsgId;
 
 		ids = new_Itl( supersedeIds, " \n\t" );
-		for ( msgId = Itl_first( ids );
-		      msgId != NULL;
-		      msgId = Itl_next( ids ) )
-		    Ctrl_cancel( msgId );
+		for ( supersededMsgId = Itl_first( ids );
+		      supersededMsgId != NULL;
+		      supersededMsgId = Itl_next( ids ) )
+		    Ctrl_cancel( supersededMsgId );
 		del_Itl( ids );
 	    }
 	}