Made set.c API more generic so it's not specific to irc_t structures anymore,

but can be used for account_t structures too, for example.

1 files changed, 19 insertions, 17 deletions

diff --git a/set.h b/set.h
index 8a7b6747..15e97b5d 100644
--- a/set.h
+++ b/set.h
@@ -1,7 +1,7 @@
   /********************************************************************\
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2006 Wilmer van der Gaast and others                *
   \********************************************************************/
 
 /* Some stuff to register, handle and save user preferences             */
@@ -25,28 +25,30 @@
 
 typedef struct set
 {
+	void *data;
+	
 	char *key;
 	char *value;
 	char *def;	/* Default */
 	
-	/* Eval: Returns NULL if the value is incorrect. Can return a
-	   corrected value. set_setstr() should be able to free() the
-	   returned string! */
-	char *(*eval) ( irc_t *irc, struct set *set, char *value );
+	/* Eval: Returns NULL 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! */
+	char *(*eval) ( struct set *set, char *value );
 	struct set *next;
 } set_t;
 
-set_t *set_add( irc_t *irc, char *key, char *def, void *eval );
-G_MODULE_EXPORT set_t *set_find( irc_t *irc, char *key );
-G_MODULE_EXPORT char *set_getstr( irc_t *irc, char *key );
-G_MODULE_EXPORT int set_getint( irc_t *irc, char *key );
-int set_setstr( irc_t *irc, char *key, char *value );
-int set_setint( irc_t *irc, char *key, int value );
-void set_del( irc_t *irc, char *key );
+set_t *set_add( set_t **head, char *key, char *def, void *eval, void *data );
+G_MODULE_EXPORT set_t *set_find( set_t **head, char *key );
+G_MODULE_EXPORT char *set_getstr( set_t **head, char *key );
+G_MODULE_EXPORT int set_getint( set_t **head, char *key );
+int set_setstr( set_t **head, char *key, char *value );
+int set_setint( set_t **head, char *key, int value );
+void set_del( set_t **head, char *key );
 
-char *set_eval_int( irc_t *irc, set_t *set, char *value );
-char *set_eval_bool( irc_t *irc, set_t *set, char *value );
+char *set_eval_int( set_t *set, char *value );
+char *set_eval_bool( set_t *set, char *value );
 
-char *set_eval_to_char( irc_t *irc, set_t *set, char *value );
-char *set_eval_ops( irc_t *irc, set_t *set, char *value );
-char *set_eval_charset( irc_t *irc, set_t *set, char *value );
+char *set_eval_to_char( set_t *set, char *value );
+char *set_eval_ops( set_t *set, char *value );
+char *set_eval_charset( set_t *set, char *value );