Changes in set.c [0383943:dd89a55]

File:

• set.c (modified) (8 diffs)

set.c

@@ -26 +26 @@
 #include "bitlbee.h"
 
-set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data )
-{
-        set_t *s = set_find( head, key );
-        
-        /* Possibly the setting already exists. If it doesn't exist yet,
-           we create it. If it does, we'll just change the default. */
+set_t *set_add( irc_t *irc, char *key, char *def, void *eval )
+{
+        set_t *s = set_find( irc, key );
+        
         if( !s )
         {
-                if( ( s = *head ) )
+                if( ( s = irc->set ) )
                 {
                         while( s->next ) s = s->next;
-                        s->next = g_new0( set_t, 1 );
+                        s->next = g_new ( set_t, 1 );
                         s = s->next;
                 }
                 else
                 {
-                        s = *head = g_new0( set_t, 1 );
+                        s = irc->set = g_new( set_t, 1 );
                 }
+                memset( s, 0, sizeof( set_t ) );
                 s->key = g_strdup( key );
         }
@@ -54 +53 @@
         if( def ) s->def = g_strdup( def );
         
-        s->eval = eval;
-        s->data = data;
-        
-        return s;
-}
-
-set_t *set_find( set_t **head, char *key )
-{
-        set_t *s = *head;
+        if( s->eval )
+        {
+                g_free( s->eval );
+                s->eval = NULL;
+        }
+        if( eval ) s->eval = eval;
+        
+        return( s );
+}
+
+set_t *set_find( irc_t *irc, char *key )
+{
+        set_t *s = irc->set;
         
         while( s )
@@ -71 +74 @@
         }
         
-        return s;
-}
-
-char *set_getstr( set_t **head, char *key )
-{
-        set_t *s = set_find( head, key );
+        return( s );
+}
+
+char *set_getstr( irc_t *irc, char *key )
+{
+        set_t *s = set_find( irc, key );
         
         if( !s || ( !s->value && !s->def ) )
-                return NULL;
-        
-        return s->value ? s->value : s->def;
-}
-
-int set_getint( set_t **head, char *key )
-{
-        char *s = set_getstr( head, key );
+                return( NULL );
+        
+        return( s->value?s->value:s->def );
+}
+
+int set_getint( irc_t *irc, char *key )
+{
+        char *s = set_getstr( irc, key );
         int i = 0;
         
         if( !s )
-                return 0;
+                return( 0 );
         
         if( ( g_strcasecmp( s, "true" ) == 0 ) || ( g_strcasecmp( s, "yes" ) == 0 ) || ( g_strcasecmp( s, "on" ) == 0 ) )
-                return 1;
+                return( 1 );
         
         if( sscanf( s, "%d", &i ) != 1 )
-                return 0;
-        
-        return i;
-}
-
-int set_getbool( set_t **head, char *key )
-{
-        char *s = set_getstr( head, key );
+                return( 0 );
+        
+        return( i );
+}
+
+int set_setstr( irc_t *irc, char *key, char *value )
+{
+        set_t *s = set_find( irc, key );
+        char *nv = value;
         
         if( !s )
-                return 0;
-        
-        return bool2int( s );
-}
-
-int set_setstr( set_t **head, char *key, char *value )
-{
-        set_t *s = set_find( head, key );
-        char *nv = value;
-        
-        if( !s )
-                s = set_add( head, key, NULL, NULL, NULL );
-        
-        if( s->eval && !( nv = s->eval( s, value ) ) )
-                return 0;
+                s = set_add( irc, key, NULL, NULL );
+        
+        if( s->eval && !( nv = s->eval( irc, s, value ) ) )
+                return( 0 );
         
         if( s->value )
@@ -128 +121 @@
         }
         
-        /* If there's a default setting and it's equal to what we're trying to
-           set, stick with s->value = NULL. Otherwise, remember the setting. */
         if( !s->def || ( strcmp( nv, s->def ) != 0 ) )
                 s->value = g_strdup( nv );
@@ -136 +127 @@
                 g_free( nv );
         
-        return 1;
-}
-
-int set_setint( set_t **head, char *key, int value )
+        return( 1 );
+}
+
+int set_setint( irc_t *irc, char *key, int value )
 {
         char s[24];     /* Not quite 128-bit clean eh? ;-) */
         
-        g_snprintf( s, sizeof( s ), "%d", value );
-        return set_setstr( head, key, s );
-}
-
-void set_del( set_t **head, char *key )
-{
-        set_t *s = *head, *t = NULL;
+        sprintf( s, "%d", value );
+        return( set_setstr( irc, key, s ) );
+}
+
+void set_del( irc_t *irc, char *key )
+{
+        set_t *s = irc->set, *t = NULL;
         
         while( s )
@@ -162 +153 @@
                         t->next = s->next;
                 else
-                        *head = s->next;
+                        irc->set = s->next;
                 
                 g_free( s->key );
@@ -171 +162 @@
 }
 
-char *set_eval_int( set_t *set, char *value )
-{
-        char *s;
-        
-        for( s = value; *s; s ++ )
-                if( !isdigit( *s ) )
-                        return NULL;
-        
-        return value;
-}
-
-char *set_eval_bool( set_t *set, char *value )
-{
-        return is_bool( value ) ? value : NULL;
-}
-
-char *set_eval_to_char( set_t *set, char *value )
+char *set_eval_int( irc_t *irc, set_t *set, char *value )
+{
+        char *s = value;
+        
+        for( ; *s; s ++ )
+                if( *s < '0' || *s > '9' )
+                        return( NULL );
+        
+        return( value );
+}
+
+char *set_eval_bool( irc_t *irc, set_t *set, char *value )
+{
+        if( ( g_strcasecmp( value, "true" ) == 0 ) || ( g_strcasecmp( value, "yes" ) == 0 ) || ( g_strcasecmp( value, "on" ) == 0 ) )
+                return( value );
+        if( ( g_strcasecmp( value, "false" ) == 0 ) || ( g_strcasecmp( value, "no" ) == 0 ) || ( g_strcasecmp( value, "off" ) == 0 ) )
+                return( value );
+        return( set_eval_int( irc, set, value ) );
+}
+
+char *set_eval_to_char( irc_t *irc, set_t *set, char *value )
 {
         char *s = g_new( char, 3 );
@@ -196 +191 @@
                 sprintf( s, "%c ", *value );
         
-        return s;
-}
-
-char *set_eval_ops( set_t *set, char *value )
-{
-        irc_t *irc = set->data;
-        
+        return( s );
+}
+
+char *set_eval_ops( irc_t *irc, set_t *set, char *value )
+{
         if( g_strcasecmp( value, "user" ) == 0 )
+        {
                 irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
                                                               irc->channel, "+o-o", irc->nick, irc->mynick );
+                return( value );
+        }
         else if( g_strcasecmp( value, "root" ) == 0 )
+        {
                 irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
                                                               irc->channel, "-o+o", irc->nick, irc->mynick );
+                return( value );
+        }
         else if( g_strcasecmp( value, "both" ) == 0 )
+        {
                 irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
                                                               irc->channel, "+oo", irc->nick, irc->mynick );
+                return( value );
+        }
         else if( g_strcasecmp( value, "none" ) == 0 )
+        {
                 irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
                                                               irc->channel, "-oo", irc->nick, irc->mynick );
-        else
-                return NULL;
-        
-        return value;
-}
-
-char *set_eval_charset( set_t *set, char *value )
-{
-        GIConv cd;
-
-        if ( g_strncasecmp( value, "none", 4 ) == 0 )
-                return value;
-
-        cd = g_iconv_open( "UTF-8", value );
-        if( cd == (GIConv) -1 )
-                return NULL;
-
-        g_iconv_close( cd );
-        return value;
-}
+                return( value );
+        }
+        
+        return( NULL );
+}
+