X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=list.c;h=68ee147c30f2006155f691a13f70bbbab704b79c;hp=dcb864d3f5ef794665efbbe2f0c487a12a4dd30b;hb=ba716001594e02b151c058333bee05e81c84e779;hpb=b3ee70e4ee07171ad5cc5050748d53db7228f232 diff --git a/list.c b/list.c index dcb864d3..68ee147c 100644 --- a/list.c +++ b/list.c @@ -1,14 +1,14 @@ -const char list_rcs[] = "$Id: list.c,v 1.13 2002/03/07 03:46:17 oes Exp $"; +const char list_rcs[] = "$Id: list.c,v 1.15.2.2 2004/05/25 02:04:23 david__schmidt 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: * `destroy_list', `enlist' and `list_to_text' * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://ijbswa.sourceforge.net + * Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -34,6 +34,19 @@ const char list_rcs[] = "$Id: list.c,v 1.13 2002/03/07 03:46:17 oes Exp $"; * * Revisions : * $Log: list.c,v $ + * 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. + * + * Revision 1.15.2.1 2002/11/28 18:14:54 oes + * Added unmap function that removes all items with a given + * name from a map. + * + * 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 + * * Revision 1.13 2002/03/07 03:46:17 oes * Fixed compiler warnings * @@ -253,11 +266,16 @@ static int list_is_valid (const struct list *the_list) /* * Arbitrarily limit 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. + */ + /* if (++length > 1000) - { + { return 0; - } + } + */ /* * Check this isn't marked as the last entry, unless of course it's @@ -1019,6 +1037,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