Changeset 5ebff60 for storage.c

Timestamp:

2015-02-20T22:50:54Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

0b9daac, 3d45471, 7733b8c

Parents:

af359b4

git-author:

Indent <please@…> (19-02-15 05:47:20)

git-committer:

dequis <dx@…> (20-02-15 22:50:54)

Message:

Reindent everything to K&R style with tabs

Used uncrustify, with the configuration file in ./doc/uncrustify.cfg

Commit author set to "Indent <please@…>" so that it's easier to
skip while doing git blame.

File:

• storage.c (modified) (9 diffs)

storage.c

@@ -1 @@
-  /********************************************************************\
+/********************************************************************\
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
@@ -46 +46 @@
         for (gl = storage_backends; gl; gl = gl->next) {
                 st = gl->data;
-                if (strcmp(st->name, name) == 0)
+                if (strcmp(st->name, name) == 0) {
                         break;
-        }
-
-        if (gl == NULL) 
+                }
+        }
+
+        if (gl == NULL) {
                 return NULL;
-
-        if (st->init)
+        }
+
+        if (st->init) {
                 st->init();
+        }
 
         return st;
@@ -64 +67 @@
         int i;
         storage_t *storage;
-        
+
         register_storage_backend(&storage_xml);
-        
+
         storage = storage_init_single(primary);
-        if (storage == NULL && storage->save == NULL)
+        if (storage == NULL && storage->save == NULL) {
                 return NULL;
+        }
 
         ret = g_list_append(ret, storage);
@@ -75 +79 @@
         for (i = 0; migrate && migrate[i]; i++) {
                 storage = storage_init_single(migrate[i]);
-        
-                if (storage)
+
+                if (storage) {
                         ret = g_list_append(ret, storage);
+                }
         }
 
@@ -83 +88 @@
 }
 
-storage_status_t storage_check_pass (const char *nick, const char *password)
-{
-        GList *gl;
-        
+storage_status_t storage_check_pass(const char *nick, const char *password)
+{
+        GList *gl;
+
         /* Loop until we don't get NO_SUCH_USER */
 
@@ -94 +99 @@
 
                 status = st->check_pass(nick, password);
-                if (status != STORAGE_NO_SUCH_USER)
+                if (status != STORAGE_NO_SUCH_USER) {
                         return status;
-        }
-        
+                }
+        }
+
         return STORAGE_NO_SUCH_USER;
 }
 
-storage_status_t storage_load (irc_t * irc, const char *password)
-{
-        GList *gl;
-        
-        if (irc && irc->status & USTATUS_IDENTIFIED)
+storage_status_t storage_load(irc_t * irc, const char *password)
+{
+        GList *gl;
+
+        if (irc && irc->status & USTATUS_IDENTIFIED) {
                 return STORAGE_OTHER_ERROR;
-        
+        }
+
         /* Loop until we don't get NO_SUCH_USER */
         for (gl = global.storage; gl; gl = gl->next) {
@@ -114 +121 @@
 
                 status = st->load(irc, password);
-                if (status == STORAGE_OK)
-                {
+                if (status == STORAGE_OK) {
                         GSList *l;
-                        for( l = irc_plugins; l; l = l->next )
-                        {
+                        for (l = irc_plugins; l; l = l->next) {
                                 irc_plugin_t *p = l->data;
-                                if( p->storage_load )
-                                        p->storage_load( irc );
+                                if (p->storage_load) {
+                                        p->storage_load(irc);
+                                }
                         }
                         return status;
                 }
-                
-                if (status != STORAGE_NO_SUCH_USER) 
+
+                if (status != STORAGE_NO_SUCH_USER) {
                         return status;
-        }
-        
+                }
+        }
+
         return STORAGE_NO_SUCH_USER;
 }
 
-storage_status_t storage_save (irc_t *irc, char *password, int overwrite)
+storage_status_t storage_save(irc_t *irc, char *password, int overwrite)
 {
         storage_status_t st;
         GSList *l;
-        
+
         if (password != NULL) {
                 /* Should only use this in the "register" command. */
-                if (irc->password || overwrite)
+                if (irc->password || overwrite) {
                         return STORAGE_OTHER_ERROR;
-                
+                }
+
                 irc_setpass(irc, password);
         } else if ((irc->status & USTATUS_IDENTIFIED) == 0) {
                 return STORAGE_NO_SUCH_USER;
         }
-        
-        st = ((storage_t *)global.storage->data)->save(irc, overwrite);
-        
-        for( l = irc_plugins; l; l = l->next )
-        {
+
+        st = ((storage_t *) global.storage->data)->save(irc, overwrite);
+
+        for (l = irc_plugins; l; l = l->next) {
                 irc_plugin_t *p = l->data;
-                if( p->storage_save )
-                        p->storage_save( irc );
-        }
-        
+                if (p->storage_save) {
+                        p->storage_save(irc);
+                }
+        }
+
         if (password != NULL) {
                 irc_setpass(irc, NULL);
         }
-        
+
         return st;
 }
 
-storage_status_t storage_remove (const char *nick, const char *password)
+storage_status_t storage_remove(const char *nick, const char *password)
 {
         GList *gl;
@@ -170 +178 @@
         gboolean ok = FALSE;
         GSList *l;
-        
-        /* Remove this account from all storage backends. If this isn't 
-         * done, the account will still be usable, it'd just be 
+
+        /* Remove this account from all storage backends. If this isn't
+         * done, the account will still be usable, it'd just be
          * loaded from a different backend. */
         for (gl = global.storage; gl; gl = gl->next) {
@@ -180 +188 @@
                 status = st->remove(nick, password);
                 ok |= status == STORAGE_OK;
-                if (status != STORAGE_NO_SUCH_USER && status != STORAGE_OK)
+                if (status != STORAGE_NO_SUCH_USER && status != STORAGE_OK) {
                         ret = status;
-        }
-        
+                }
+        }
+
         /* If at least one succeeded, remove plugin data. */
-        if( ok )
-                for( l = irc_plugins; l; l = l->next )
-                {
+        if (ok) {
+                for (l = irc_plugins; l; l = l->next) {
                         irc_plugin_t *p = l->data;
-                        if( p->storage_remove )
-                                p->storage_remove( nick );
-                }
-        
+                        if (p->storage_remove) {
+                                p->storage_remove(nick);
+                        }
+                }
+        }
+
         return ret;
 }