Changeset 89db90e for storage_xml.c

Timestamp:

2015-03-12T09:10:16Z (9 years ago)

Author:

dequis <dx@…>

Children:

fc650a8

Parents:

0e4c3dd (diff), 3bb333c (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 branch 'develop' into feat/hip-cat

File:

• storage_xml.c (modified) (8 diffs)

storage_xml.c

@@ -103 +103 @@
         if (protocol) {
                 prpl = find_protocol(protocol);
+                if (!prpl) {
+                        irc_rootmsg(xd->irc, "Error loading user config: Protocol not found: `%s'", protocol);
+                        return XT_ABORT;
+                }
                 local = protocol_account_islocal(protocol);
         }
@@ -197 +201 @@
         fn = g_strconcat(global.conf->configdir, xd->given_nick, ".xml", NULL);
         if ((fd = open(fn, O_RDONLY)) < 0) {
-                ret = STORAGE_NO_SUCH_USER;
+                if (errno == ENOENT) {
+                        ret = STORAGE_NO_SUCH_USER;
+                } else {
+                        irc_rootmsg(irc, "Error loading user config: %s", g_strerror(errno));
+                }
                 goto error;
         }
@@ -259 +267 @@
 
 
-static gboolean xml_generate_nick(gpointer key, gpointer value, gpointer data);
 static void xml_generate_settings(struct xt_node *cur, set_t **head);
 
@@ -292 +299 @@
 
         for (acc = irc->b->accounts; acc; acc = acc->next) {
+                GHashTableIter iter;
+                gpointer key, value;
                 unsigned char *pass_cr;
                 char *pass_b64;
@@ -312 +321 @@
                 g_free(pass_b64);
 
-                /* This probably looks pretty strange. g_hash_table_foreach
-                   is quite a PITA already (but it can't get much better in
-                   C without using #define, I'm afraid), and it
-                   doesn't seem to be possible to abort the foreach on write
-                   errors, so instead let's use the _find function and
-                   return TRUE on write errors. Which means, if we found
-                   something, there was an error. :-) */
-                g_hash_table_find(acc->nicks, xml_generate_nick, cur);
+                g_hash_table_iter_init(&iter, acc->nicks);
+                while (g_hash_table_iter_next(&iter, &key, &value)) {
+                        struct xt_node *node = xt_new_node("buddy", NULL, NULL);
+                        xt_add_attr(node, "handle", key);
+                        xt_add_attr(node, "nick", value);
+                        xt_add_child(cur, node);
+                }
 
                 xml_generate_settings(cur, &acc->set);
@@ -343 +351 @@
 
         return root;
-}
-
-static gboolean xml_generate_nick(gpointer key, gpointer value, gpointer data)
-{
-        struct xt_node *node = xt_new_node("buddy", NULL, NULL);
-
-        xt_add_attr(node, "handle", key);
-        xt_add_attr(node, "nick", value);
-        xt_add_child((struct xt_node *) data, node);
-
-        return FALSE;
 }
 
@@ -388 +385 @@
         strcat(path, ".XXXXXX");
         if ((fd = mkstemp(path)) < 0) {
-                irc_rootmsg(irc, "Error while opening configuration file.");
-                return STORAGE_OTHER_ERROR;
+                goto error;
         }
 
@@ -411 +407 @@
 
 error:
-        irc_rootmsg(irc, "Write error. Disk full?");
+        irc_rootmsg(irc, "Write error: %s", g_strerror(errno));
         ret = STORAGE_OTHER_ERROR;