Changeset 297d1d02

Timestamp:

2012-06-07T23:11:15Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

bfafb99

Parents:

e222c36

Message:

Remove storage_rename() which was never tested/used, and current /NICK support
should be sufficient.

Files:

• storage.c (modified) (1 diff)
• storage.h (modified) (1 diff)

storage.c

@@ -195 +195 @@
         return ret;
 }
-
-#if 0
-Not using this yet. Test thoroughly before adding UI hooks to this function.
-
-storage_status_t storage_rename (const char *onick, const char *nnick, const char *password)
-{
-        storage_status_t status;
-        GList *gl = global.storage;
-        storage_t *primary_storage = gl->data;
-        irc_t *irc;
-
-        /* First, try to rename in the current write backend, assuming onick 
-         * is stored there */
-        status = primary_storage->rename(onick, nnick, password);
-        if (status != STORAGE_NO_SUCH_USER)
-                return status;
-
-        /* Try to load from a migration backend and save to the current backend. 
-         * Explicitly remove the account from the migration backend as otherwise 
-         * it'd still be usable under the old name */
-        
-        irc = g_new0(irc_t, 1);
-        status = storage_load(onick, password, irc);
-        if (status != STORAGE_OK) {
-                irc_free(irc);
-                return status;
-        }
-
-        g_free(irc->nick);
-        irc->nick = g_strdup(nnick);
-
-        status = storage_save(irc, FALSE);
-        if (status != STORAGE_OK) {
-                irc_free(irc);
-                return status;
-        }
-        irc_free(irc);
-
-        storage_remove(onick, password);
-
-        return STORAGE_OK;
-}
-#endif

storage.h

@@ -59 +59 @@
 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 *);
 G_GNUC_MALLOC GList *storage_init(const char *primary, char **migrate);