Changes in storage_xml.c [098a75b:5ebff60]

File:

• storage_xml.c (modified) (9 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);
         }
@@ -128 +124 @@
                 }
         } else {
-                g_free(pass_cr);
-                g_free(password);
                 return XT_ABORT;
         }
@@ -203 +197 @@
         fn = g_strconcat(global.conf->configdir, xd->given_nick, ".xml", NULL);
         if ((fd = open(fn, O_RDONLY)) < 0) {
-                if (errno == ENOENT) {
-                        ret = STORAGE_NO_SUCH_USER;
-                } else {
-                        irc_rootmsg(irc, "Error loading user config: %s", g_strerror(errno));
-                }
+                ret = STORAGE_NO_SUCH_USER;
                 goto error;
         }
@@ -269 +259 @@
 
 
+static gboolean xml_generate_nick(gpointer key, gpointer value, gpointer data);
 static void xml_generate_settings(struct xt_node *cur, set_t **head);
 
@@ -301 +292 @@
 
         for (acc = irc->b->accounts; acc; acc = acc->next) {
-                GHashTableIter iter;
-                gpointer key, value;
                 unsigned char *pass_cr;
                 char *pass_b64;
@@ -323 +312 @@
                 g_free(pass_b64);
 
-                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);
-                }
+                /* 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);
 
                 xml_generate_settings(cur, &acc->set);
@@ -353 +343 @@
 
         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;
 }
 
@@ -387 +388 @@
         strcat(path, ".XXXXXX");
         if ((fd = mkstemp(path)) < 0) {
-                goto error;
+                irc_rootmsg(irc, "Error while opening configuration file.");
+                return STORAGE_OTHER_ERROR;
         }
 
@@ -409 +411 @@
 
 error:
-        irc_rootmsg(irc, "Write error: %s", g_strerror(errno));
+        irc_rootmsg(irc, "Write error. Disk full?");
         ret = STORAGE_OTHER_ERROR;