Changeset 7125cb3 for set.c

Timestamp:

2008-08-24T18:01:05Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f3579fd

Parents:

934dddf3

Message:

Added SET_INVALID, which set evaluators should now return instead of NULL
when the given value is not accepted. This to allow certain variables
actually be set to NULL (server, for example). This should fully close
#444.

File:

• set.c (modified) (5 diffs)

set.c

@@ -25 +25 @@
 #define BITLBEE_CORE
 #include "bitlbee.h"
+
+/* Used to use NULL for this, but NULL is actually a "valid" value. */
+char *SET_INVALID = "nee";
 
 set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data )
@@ -114 +117 @@
         
         if( !s )
+                /*
+                Used to do this, but it never really made sense.
                 s = set_add( head, key, NULL, NULL, NULL );
-        
-        if( s->eval && !( nv = s->eval( s, value ) ) )
+                */
+                return 0;
+        
+        if( value == NULL && ( s->flags & SET_NULL_OK ) == 0 )
+                return 0;
+        
+        /* Call the evaluator. For invalid values, evaluators should now
+           return SET_INVALID, but previously this was NULL. Try to handle
+           that too if NULL is not an allowed value for this setting. */
+        if( s->eval && ( ( nv = s->eval( s, value ) ) == SET_INVALID ||
+                         ( ( s->flags & SET_NULL_OK ) == 0 && nv == NULL ) ) )
                 return 0;
         
@@ -187 +201 @@
         for( ; *s; s ++ )
                 if( !isdigit( *s ) )
-                        return NULL;
+                        return SET_INVALID;
         
         return value;
@@ -194 +208 @@
 char *set_eval_bool( set_t *set, char *value )
 {
-        return is_bool( value ) ? value : NULL;
+        return is_bool( value ) ? value : SET_INVALID;
 }
 
@@ -226 +240 @@
                                                               irc->channel, "-oo", irc->nick, irc->mynick );
         else
-                return NULL;
+                return SET_INVALID;
         
         return value;