Changeset 09adf08

Timestamp:

2005-12-08T15:31:25Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

7cad7b4

Parents:

8efa2f4

Message:

Couple of small bugfixes

Files:

• commands.c (modified) (2 diffs)
• storage_text.c (modified) (1 diff)

commands.c

@@ -86 +86 @@
 int cmd_identify( irc_t *irc, char **cmd )
 {
-        int checkie = global.storage->load( irc->nick, cmd[1], irc );
-        
-        if( checkie == -1 )
-        {
+        storage_status_t status = global.storage->load( irc->nick, cmd[1], irc );
+        
+        switch (status) {
+        case STORAGE_INVALID_PASSWORD:
                 irc_usermsg( irc, "Incorrect password" );
-        }
-        else if( checkie == 0 )
-        {
+                break;
+        case STORAGE_NO_SUCH_USER:
                 irc_usermsg( irc, "The nick is (probably) not registered" );
-        }
-        else if( checkie == 1 )
-        {
+                break;
+        case STORAGE_OK:
                 irc_usermsg( irc, "Password accepted" );
-        }
-        else
-        {
+                break;
+        default:
                 irc_usermsg( irc, "Something very weird happened" );
+                break;
         }
         
@@ -618 +616 @@
 int cmd_save( irc_t *irc, char **cmd )
 {
-        if( global.storage->save( irc, TRUE ) )
+        if( global.storage->save( irc, TRUE ) == STORAGE_OK )
                 irc_usermsg( irc, "Configuration saved" );
         else

storage_text.c

@@ -277 +277 @@
         fclose( fp );
 
-        /*FIXME Test if password is correct */
+        /*FIXME: Check password */
 
         return STORAGE_OK;