Changeset e222c36 for storage_xml.c

Timestamp:

2012-06-07T22:45:24Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

297d1d02

Parents:

bb5ce568

Message:

Add xml_generate_settings(), little less code duplication.

File:

• storage_xml.c (modified) (6 diffs)

storage_xml.c

@@ -251 +251 @@
 
 static gboolean xml_generate_nick( gpointer key, gpointer value, gpointer data );
+static void xml_generate_settings( struct xt_node *cur, set_t **head );
 
 struct xt_node *xml_generate( irc_t *irc )
 {
         char *pass_buf = NULL;
-        set_t *set;
         account_t *acc;
         md5_byte_t pass_md5[21];
@@ -280 +280 @@
         g_free( pass_buf );
         
-        for( set = irc->b->set; set; set = set->next )
-                if( set->value && !( set->flags & SET_NOSAVE ) )
-                {
-                        struct xt_node *xset;
-                        xt_add_child( cur, xset = xt_new_node( "setting", set->value, NULL ) );
-                        xt_add_attr( xset, "name", set->key );
-                }
+        xml_generate_settings( cur, &irc->b->set );
         
         for( acc = irc->b->accounts; acc; acc = acc->next )
@@ -309 +303 @@
                 g_free( pass_b64 );
                 
-                for( set = acc->set; set; set = set->next )
-                        if( set->value && !( set->flags & SET_NOSAVE ) )
-                        {
-                                struct xt_node *xset;
-                                xt_add_child( cur, xset = xt_new_node( "setting", set->value, NULL ) );
-                                xt_add_attr( xset, "name", set->key );
-                        }
-                
                 /* This probably looks pretty strange. g_hash_table_foreach
                    is quite a PITA already (but it can't get much better in
@@ -326 +312 @@
                 g_hash_table_find( acc->nicks, xml_generate_nick, cur );
                 
+                xml_generate_settings( cur, &acc->set );
+                
                 xt_add_child( root, cur );
         }
@@ -340 +328 @@
                 xt_add_attr( cur, "type", set_getstr( &ic->set, "type" ) );
                 
-                for( set = ic->set; set; set = set->next )
-                        if( set->value && strcmp( set->key, "type" ) != 0 )
-                        {
-                                struct xt_node *xset;
-                                xt_add_child( cur, xset = xt_new_node( "setting", set->value, NULL ) );
-                                xt_add_attr( xset, "name", set->key );
-                        }
+                xml_generate_settings( cur, &ic->set );
                 
                 xt_add_child( root, cur );
@@ -362 +344 @@
         
         return FALSE;
+}
+
+static void xml_generate_settings( struct xt_node *cur, set_t **head )
+{
+        set_t *set;
+        
+        for( set = *head; set; set = set->next )
+                if( set->value && !( set->flags & SET_NOSAVE ) )
+                {
+                        struct xt_node *xset;
+                        xt_add_child( cur, xset = xt_new_node( "setting", set->value, NULL ) );
+                        xt_add_attr( xset, "name", set->key );
+                }
 }