Changeset 2288705 for set.h

Timestamp:

2009-12-07T21:54:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1c3008a

Parents:

aac4017 (diff), 36cf9fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging head.

File:

• set.h (modified) (3 diffs)

set.h

@@ -44 +44 @@
 typedef char *(*set_eval) ( struct set *set, char *value );
 
+extern char *SET_INVALID;
+
+#define SET_NULL_OK        0x0100
+
 typedef struct set
 {
@@ -61 +65 @@
                            this (yet?). */
         
-        /* Eval: Returns NULL if the value is incorrect or exactly the
-           passed value variable. When returning a corrected value,
+        /* Eval: Returns SET_INVALID if the value is incorrect or exactly
+           the passed value variable. When returning a corrected value,
            set_setstr() should be able to free() the returned string! */
         set_eval eval;
@@ -88 +92 @@
 int set_setint( set_t **head, char *key, int value );
 void set_del( set_t **head, char *key );
-void set_reset( set_t **head, char *key );
+int set_reset( set_t **head, char *key );
 
 /* Two very useful generic evaluators. */