From: oes <oes@users.sourceforge.net>
Date: Thu, 28 Nov 2002 18:14:54 +0000 (+0000)
Subject: Added unmap function that removes all items with a given
X-Git-Tag: v_3_0_1~68
X-Git-Url: http://www.privoxy.org/gitweb/?a=commitdiff_plain;h=d55a36ccca8f584bb15be6dd2990b1af14fe65dc;p=privoxy.git

Added unmap function that removes all items with a given
name from a map.
---

diff --git a/list.c b/list.c
index 6cd7f891..11b80049 100644
--- a/list.c
+++ b/list.c
@@ -1,7 +1,7 @@
-const char list_rcs[] = "$Id: list.c,v 1.14 2002/03/24 13:25:43 swa Exp $";
+const char list_rcs[] = "$Id: list.c,v 1.15 2002/03/26 22:29:55 swa Exp $";
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/list.c,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/Attic/list.c,v $
  *
  * Purpose     :  Declares functions to handle lists.
  *                Functions declared include:
@@ -34,6 +34,9 @@ const char list_rcs[] = "$Id: list.c,v 1.14 2002/03/24 13:25:43 swa Exp $";
  *
  * Revisions   :
  *    $Log: list.c,v $
+ *    Revision 1.15  2002/03/26 22:29:55  swa
+ *    we have a new homepage!
+ *
  *    Revision 1.14  2002/03/24 13:25:43  swa
  *    name change related issues
  *
@@ -1022,6 +1025,71 @@ jb_err map(struct map *the_map,
 }
 
 
+/*********************************************************************
+ *
+ * Function    :  unmap
+ *
+ * Description :  Remove all map_entry structs with a given name from
+ *                a given map.
+ *
+ * Parameters  :
+ *          1  :  the_map = map to look in
+ *          2  :  name = name to unmap
+ *
+ * Returns     :  JB_ERR_OK
+ *
+ *********************************************************************/
+jb_err unmap(struct map *the_map, const char *name)
+{
+   struct map_entry *cur_entry, *last_entry;
+
+   assert(the_map);
+   assert(name);
+   
+   last_entry = the_map->first;
+
+   for (cur_entry = the_map->first; cur_entry != NULL; cur_entry = cur_entry->next)
+   {
+      if (!strcmp(name, cur_entry->name))
+      {
+         /*
+          * Update the incoming pointer
+          */
+         if (cur_entry == the_map->first)
+         {
+            the_map->first = cur_entry->next;
+         }
+         else
+         {
+            last_entry->next = cur_entry->next;
+         }
+
+         /*
+          * Update the map's last pointer 
+          */
+         if (cur_entry == the_map->last)
+         {
+            the_map->last = last_entry;
+         }
+         
+         /*
+          * Free the map_entry
+          */
+         freez(cur_entry->name);
+         freez(cur_entry->value);
+         freez(cur_entry);
+
+         cur_entry = last_entry;
+      }
+      else
+      {
+         last_entry = cur_entry;
+      }
+   }
+   return JB_ERR_OK;
+}
+
+
 /*********************************************************************
  *
  * Function    :  lookup
diff --git a/list.h b/list.h
index afa44238..6366e8b1 100644
--- a/list.h
+++ b/list.h
@@ -1,9 +1,9 @@
 #ifndef LIST_H_INCLUDED
 #define LIST_H_INCLUDED
-#define LIST_H_VERSION "$Id: list.h,v 1.11 2002/03/24 13:25:43 swa Exp $"
+#define LIST_H_VERSION "$Id: list.h,v 1.12 2002/03/26 22:29:55 swa Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/list.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/Attic/list.h,v $
  *
  * Purpose     :  Declares functions to handle lists.
  *                Functions declared include:
@@ -36,6 +36,9 @@
  *
  * Revisions   :
  *    $Log: list.h,v $
+ *    Revision 1.12  2002/03/26 22:29:55  swa
+ *    we have a new homepage!
+ *
  *    Revision 1.11  2002/03/24 13:25:43  swa
  *    name change related issues
  *
@@ -141,9 +144,11 @@ extern char * list_to_text(const struct list *the_list);
 extern struct map * new_map  (void);
 extern void         free_map (struct map * the_map);
 
-extern int          map      (struct map * the_map,
+extern jb_err       map      (struct map * the_map,
                               const char * name, int name_needs_copying,
                               const char * value, int value_needs_copying);
+extern jb_err       unmap    (struct map *the_map,
+                              const char *name);
 extern const char * lookup   (const struct map * the_map, const char * name);