X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=list.h;h=30fc711b1a5c5f4738c5eeb9f15cda83df8fa54e;hp=8cee8f62071b9e1433d3fd0a4337b2a770239057;hb=5b4ed92e93b85065f6898d5a52340aedd349fd7e;hpb=3e5aa1e1d1a0e1c28619c2388be8c1a0ae4fbeb9

diff --git a/list.h b/list.h
index 8cee8f62..30fc711b 100644
--- a/list.h
+++ b/list.h
@@ -1,6 +1,6 @@
 #ifndef LIST_H_INCLUDED
 #define LIST_H_INCLUDED
-#define LIST_H_VERSION "$Id: list.h,v 1.4 2001/06/29 13:30:37 oes Exp $"
+#define LIST_H_VERSION "$Id: list.h,v 1.9 2001/10/23 21:21:03 jongfoster Exp $"
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/list.h,v $
@@ -36,6 +36,30 @@
  *
  * Revisions   :
  *    $Log: list.h,v $
+ *    Revision 1.9  2001/10/23 21:21:03  jongfoster
+ *    New error handling - error codes are now jb_errs, not ints.
+ *    Changed the way map() handles out-of-memory, to dramatically
+ *    reduce the amount of error-checking clutter needed.
+ *
+ *    Revision 1.8  2001/09/16 17:30:24  jongfoster
+ *    Fixing a compiler warning.
+ *
+ *    Revision 1.7  2001/09/16 13:20:29  jongfoster
+ *    Rewrite of list library.  Now has seperate header and list_entry
+ *    structures.  Also added a large sprinking of assert()s to the list
+ *    code.
+ *
+ *    Revision 1.6  2001/08/05 16:06:20  jongfoster
+ *    Modifiying "struct map" so that there are now separate header and
+ *    "map_entry" structures.  This means that functions which modify a
+ *    map no longer need to return a pointer to the modified map.
+ *    Also, it no longer reverses the order of the entries (which may be
+ *    important with some advanced template substitutions).
+ *
+ *    Revision 1.5  2001/07/29 18:43:08  jongfoster
+ *    Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to
+ *    ANSI C rules.
+ *
  *    Revision 1.4  2001/06/29 13:30:37  oes
  *    - Introduced enlist_unique_header()
  *    - Removed logentry from cancelled commit
@@ -74,25 +98,48 @@ extern "C" {
 #endif
 
 
-extern void enlist(struct list *h, const char *s);
-extern void enlist_unique(struct list *header, const char *str, int n);
-extern void enlist_unique_header(struct list *header, const char *name, const char *value);
-extern void enlist_first(struct list *header, const char *str);
+/*
+ * struct list
+ *
+ * A linked list class.
+ */
+
+extern void init_list    (struct list *the_list);
+extern void destroy_list (struct list *the_list);
 
-extern int   list_remove_item(struct list *header, const char *str);
+extern jb_err enlist                 (struct list *the_list, const char *str);
+extern jb_err enlist_unique          (struct list *the_list, const char *str, size_t num_significant_chars);
+extern jb_err enlist_unique_header   (struct list *the_list, const char *name, const char *value);
+extern jb_err enlist_first           (struct list *the_list, const char *str);
+extern jb_err list_append_list_unique(struct list *dest,     const struct list *src);
+extern jb_err list_duplicate         (struct list *dest,     const struct list *src);
 
-extern void  list_append_list_unique(struct list *dest, const struct list *src);
-extern void  list_append_list_unique(struct list *dest, const struct list *src);
-extern int   list_remove_list(struct list *header, const struct list *to_remove);
+extern int    list_remove_item(struct list *the_list, const char *str);
+extern int    list_remove_list(struct list *dest,     const struct list *src);
+extern void   list_remove_all (struct list *the_list);
+
+extern int    list_is_empty(const struct list *the_list);
+
+extern char * list_to_text(const struct list *the_list);
+
+
+/*
+ * struct map
+ *
+ * A class which maps names to values.
+ *
+ * Note: You must allocate this through new_map() and free it
+ * through free_map().
+ */
 
-extern void  list_duplicate(struct list *dest, const struct list *src);
+extern struct map * new_map  (void);
+extern void         free_map (struct map * the_map);
 
-extern void  destroy_list(struct list *h);
-extern char *list_to_text(struct list *h);
+extern int          map      (struct map * the_map,
+                              const char * name, int name_needs_copying,
+                              const char * value, int value_needs_copying);
+extern const char * lookup   (const struct map * the_map, const char * name);
 
-extern struct map* map(struct map* map, char *name, int nc, char *value, int vc);
-extern char *lookup(struct map *list, char *name);
-extern void free_map(struct map *list);
 
 /* Revision control strings from this header and associated .c file */
 extern const char list_rcs[];