Changeset d5c55ac

Timestamp:

2015-02-22T21:19:21Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

273949d

Parents:

5ff4618

git-author:

dequis <dx@…> (23-01-15 07:01:05)

git-committer:

dequis <dx@…> (22-02-15 21:19:21)

Message:

storage_xml: replace hackish code with a GHashTableIter

File:

• storage_xml.c (modified) (4 diffs)

storage_xml.c

@@ -259 +259 @@
 
 
-static gboolean xml_generate_nick(gpointer key, gpointer value, gpointer data);
 static void xml_generate_settings(struct xt_node *cur, set_t **head);
 
@@ -292 +291 @@
 
         for (acc = irc->b->accounts; acc; acc = acc->next) {
+                GHashTableIter iter;
+                gpointer key, value;
                 unsigned char *pass_cr;
                 char *pass_b64;
@@ -312 +313 @@
                 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 +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;
 }