X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=list.c;h=2cbe763d2b7e38b115c665866fa86be5392bcb60;hp=68ee147c30f2006155f691a13f70bbbab704b79c;hb=f9888d9c1d0b5b4e082718508532ddaf2ba8759c;hpb=72081f829de368392d04076728f8c991178c0080

diff --git a/list.c b/list.c
index 68ee147c..2cbe763d 100644
--- a/list.c
+++ b/list.c
@@ -1,7 +1,7 @@
-const char list_rcs[] = "$Id: list.c,v 1.15.2.2 2004/05/25 02:04:23 david__schmidt Exp $";
+const char list_rcs[] = "$Id: list.c,v 1.17 2006/07/18 14:48:46 david__schmidt Exp $";
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/Attic/list.c,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/list.c,v $
  *
  * Purpose     :  Declares functions to handle lists.
  *                Functions declared include:
@@ -34,6 +34,10 @@ const char list_rcs[] = "$Id: list.c,v 1.15.2.2 2004/05/25 02:04:23 david__schmi
  *
  * Revisions   :
  *    $Log: list.c,v $
+ *    Revision 1.17  2006/07/18 14:48:46  david__schmidt
+ *    Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ *    with what was really the latest development (the v_3_0_branch branch)
+ *
  *    Revision 1.15.2.2  2004/05/25 02:04:23  david__schmidt
  *    Removed the "arbitrary" 1000 filter limit in file.c.  See tracker #911950.
  *
@@ -150,7 +154,7 @@ static int list_is_valid (const struct list *the_list);
 
 /*********************************************************************
  *
- * Function    :  list_init
+ * Function    :  init_list
  *
  * Description :  Create a new, empty list in user-allocated memory.
  *                Caller should allocate a "struct list" variable,
@@ -239,7 +243,7 @@ static int list_is_valid (const struct list *the_list)
 #if 1
    const struct list_entry *cur_entry;
    const struct list_entry *last_entry = NULL;
-   int length = 0;
+   int entry = 0;
 
    assert(the_list);
 
@@ -253,25 +257,25 @@ static int list_is_valid (const struct list *the_list)
           * Just check that this string can be accessed - i.e. it's a valid
           * pointer.
           */
-         strlen(cur_entry->str);
+         (void)strlen(cur_entry->str);
       }
 
       /*
        * Check for looping back to first
        */
-      if ((length != 0) && (cur_entry == the_list->first))
+      if ((entry++ != 0) && (cur_entry == the_list->first))
       {
          return 0;
       }
 
       /*
-       * Arbitrarily limit length to prevent infinite loops.
+       * Arbitrarily limit list length to prevent infinite loops.
        * Note that the 1000 limit was hit by a real user in tracker 911950;
-       * removing it for now.  Symptoms of a real circular reference will
-       * include 100% CPU usage, I'd imagine.  It'll be obvious, anyway.
+       * removing it for now.  Real circular references should eventually
+       * be caught by the check above, anyway.
        */         
       /*
-      if (++length > 1000)
+      if (entry > 1000)
       {           
          return 0;
       }