Changeset d3307e2 for commands.c

Timestamp:

2005-12-13T23:07:05Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

6aaa221

Parents:

34759e6 (diff), b73ac9c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge my storage fixes

File:

• commands.c (modified) (5 diffs)

commands.c

@@ -86 +86 @@
 int cmd_identify( irc_t *irc, char **cmd )
 {
-        storage_status_t status = global.storage->load( irc->nick, cmd[1], irc );
+        storage_status_t status = storage_load( irc->nick, cmd[1], irc );
         
         switch (status) {
@@ -102 +102 @@
                 break;
         }
-        
+
         return( 0 );
 }
@@ -115 +115 @@
 
         irc_setpass( irc, cmd[1] );
-        switch( global.storage->save( irc, FALSE )) {
+        switch( storage_save( irc, FALSE )) {
                 case STORAGE_ALREADY_EXISTS:
                         irc_usermsg( irc, "Nick is already registered" );
@@ -136 +136 @@
         storage_status_t status;
         
-        status = global.storage->remove (irc->nick, cmd[1]);
+        status = storage_remove (irc->nick, cmd[1]);
         switch (status) {
         case STORAGE_NO_SUCH_USER:
@@ -616 +616 @@
 int cmd_save( irc_t *irc, char **cmd )
 {
-        if( global.storage->save( irc, TRUE ) == STORAGE_OK )
+        if( storage_save( irc, TRUE ) == STORAGE_OK )
                 irc_usermsg( irc, "Configuration saved" );
         else