Changeset 823de9d for set.c

Timestamp:

2009-03-12T19:10:06Z (16 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

673a54c

Parents:

9b55485

Message:

commit updates by ashish shukla <wahjava@…>

File:

• set.c (modified) (10 diffs)

set.c

@@ -26 +26 @@
 #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;
         
@@ -168 +182 @@
 }
 
-void set_reset( set_t **head, char *key )
+int set_reset( set_t **head, char *key )
 {
         set_t *s;
@@ -174 +188 @@
         s = set_find( head, key );
         if( s )
-                set_setstr( head, key, s->def );
+                return set_setstr( head, key, s->def );
+        
+        return 0;
 }
 
@@ -187 +203 @@
         for( ; *s; s ++ )
                 if( !isdigit( *s ) )
-                        return NULL;
+                        return SET_INVALID;
         
         return value;
@@ -194 +210 @@
 char *set_eval_bool( set_t *set, char *value )
 {
-        return is_bool( value ) ? value : NULL;
+        return is_bool( value ) ? value : SET_INVALID;
 }
 
@@ -209 +225 @@
 }
 
-char *set_eval_op_root( set_t *set, char *value )
+char* set_eval_op_root( set_t *set, char* value )
 {
         irc_t *irc = set->data;
-        char *ret = set_eval_bool(set, value);
+        char* ret = set_eval_bool(set, value);
         int b = bool2int(ret);
-        
+
         irc_write( irc, ":%s!%s@%s MODE %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                   irc->channel, b?"+o":"-o", irc->mynick );
+                                               irc->channel, b?"+o":"-o", irc->mynick);
+
         return ret;
 }
 
-char *set_eval_op_user( set_t *set, char *value )
+char* set_eval_op_user( set_t *set, char* value )
 {
         irc_t *irc = set->data;
-        char *ret = set_eval_bool(set, value);
+        char* ret = set_eval_bool(set, value);
         int b = bool2int(ret);
-        
+
         irc_write( irc, ":%s!%s@%s MODE %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                   irc->channel, b?"+o":"-o", irc->nick );
+                                               irc->channel, b?"+o":"-o", irc->nick);
+
         return ret;
 }
@@ -250 +268 @@
         else
                 return NULL;
-        
+
         /* sorry for calling them op/deop - too lazy for search+replace :P */
         op[0]='\0';
@@ -335 +353 @@
                 char *flags = g_strnfill(ndeop, modeflag);
                 irc_write( irc, ":%s!%s@%s MODE %s -%s%s", irc->mynick, irc->mynick, irc->myhost,
-                                                       irc->channel, flags, deop );
-                g_free(flags);
-        }
-        
+                                                   irc->channel, flags, deop );
+        g_free(flags);
+    }
+
         return value;
 }
@@ -370 +388 @@
         return NULL;
 }
+