Changeset 3b32017

Timestamp:

2008-08-19T22:21:07Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

88d2208

Parents:

a830512

Message:

Better handling of NULLs passed to set_eval_account(). Still confusing
though, set_reset() is broken for variables that can actually be NULL.

File:

• account.c (modified) (2 diffs)

account.c

@@ -79 +79 @@
                 return NULL;
         
-        if( strcmp( set->key, "username" ) == 0 )
+        if( strcmp( set->key, "server" ) == 0 )
+        {
+                g_free( acc->server );
+                if( value && *value )
+                {
+                        acc->server = g_strdup( value );
+                        return value;
+                }
+                else
+                {
+                        acc->server = NULL;
+                        return g_strdup( set->def );
+                }
+        }
+        else if( value == NULL )
+        {
+                /* Noop, the other three can't be NULL. */
+        }
+        else if( strcmp( set->key, "username" ) == 0 )
         {
                 g_free( acc->user );
@@ -90 +108 @@
                 acc->pass = g_strdup( value );
                 return NULL;    /* password shouldn't be visible in plaintext! */
-        }
-        else if( strcmp( set->key, "server" ) == 0 )
-        {
-                g_free( acc->server );
-                if( *value )
-                {
-                        acc->server = g_strdup( value );
-                        return value;
-                }
-                else
-                {
-                        acc->server = NULL;
-                        return g_strdup( set->def );
-                }
         }
         else if( strcmp( set->key, "auto_connect" ) == 0 )