Changeset ab49fdc

Timestamp:

2005-12-10T14:50:49Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a301379c

Parents:

87c24ba

Message:

Use helper functions rather then the backends directly. This will be
used for transparent upgrade support later on.

Files:

• commands.c (modified) (4 diffs)
• irc.c (modified) (1 diff)
• storage.c (modified) (1 diff)
• storage.h (modified) (1 diff)

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) {
@@ -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

irc.c

@@ -161 +161 @@
         
         if( irc->status >= USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
-                if( !global.storage->save( irc, TRUE ) )
+                if( !storage_save( irc, TRUE ) )
                         irc_usermsg( irc, "Error while saving settings!" );
         

storage.c

@@ -57 +57 @@
         return st;
 }
+
+storage_status_t storage_check_pass (const char *nick, const char *password)
+{
+        return global.storage->check_pass(nick, password);
+}
+
+storage_status_t storage_load (const char *nick, const char *password, irc_t * irc)
+{
+        return global.storage->load(nick, password, irc);
+}
+
+storage_status_t storage_save (irc_t *irc, int overwrite)
+{
+        return global.storage->save(irc, overwrite);
+}
+
+storage_status_t storage_remove (const char *nick, const char *password)
+{
+        return global.storage->remove(nick, password);
+}
+
+storage_status_t storage_rename (const char *onick, const char *nnick, const char *password)
+{
+        return global.storage->rename(onick, nnick, password);
+}

storage.h

@@ -53 +53 @@
 } storage_t;
 
+storage_status_t storage_check_pass (const char *nick, const char *password);
+
+storage_status_t storage_load (const char *nick, const char *password, irc_t * irc);
+storage_status_t storage_save (irc_t *irc, int overwrite);
+storage_status_t storage_remove (const char *nick, const char *password);
+
+storage_status_t storage_rename (const char *onick, const char *nnick, const char *password);
+
 void register_storage_backend(storage_t *);
 storage_t *storage_init(const char *name);