Changeset 222b440

Timestamp:

2012-06-05T20:19:56Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

15581c1

Parents:

d219296

Message:

Add xt_to_string_i() and use it to get indentation back in saved settings.
Also, use it in xt_print() instead of replicating most of xt_to_string()
in it. This changed four-space indents into tabs but oh well, we'll live.

Files:

• lib/xmltree.c (modified) (4 diffs)
• lib/xmltree.h (modified) (1 diff)
• storage_xml.c (modified) (1 diff)

lib/xmltree.c

@@ -277 +277 @@
 }
 
-static void xt_to_string_real( struct xt_node *node, GString *str )
+static void xt_to_string_real( struct xt_node *node, GString *str, int indent )
 {
         char *buf;
@@ -283 +283 @@
         int i;
         
+        if( indent > 1 )
+                g_string_append_len( str, "\n\t\t\t\t\t\t\t\t",
+                                     indent < 8 ? indent : 8 );
+        
         g_string_append_printf( str, "<%s", node->name );
         
@@ -307 +311 @@
         
         for( c = node->children; c; c = c->next )
-                xt_to_string_real( c, str );
+                xt_to_string_real( c, str, indent ? indent + 1 : 0 );
+        
+        if( indent > 0 && node->children )
+                g_string_append_len( str, "\n\t\t\t\t\t\t\t\t",
+                                     indent < 8 ? indent : 8 );
         
         g_string_append_printf( str, "</%s>", node->name );
@@ -315 +323 @@
 {
         GString *ret;
-        char *real;
         
         ret = g_string_new( "" );
-        xt_to_string_real( node, ret );
-        
-        real = ret->str;
-        g_string_free( ret, FALSE );
-        
-        return real;
+        xt_to_string_real( node, ret, 0 );
+        return g_string_free( ret, FALSE );
+}
+
+/* WITH indentation! */
+char *xt_to_string_i( struct xt_node *node )
+{
+        GString *ret;
+        
+        ret = g_string_new( "" );
+        xt_to_string_real( node, ret, 1 );
+        return g_string_free( ret, FALSE );
 }
 
 void xt_print( struct xt_node *node )
 {
-        int i;
-        struct xt_node *c;
-        
-        /* Indentation */
-        for( c = node; c->parent; c = c->parent )
-                fprintf( stderr, "    " );
-        
-        /* Start the tag */
-        fprintf( stderr, "<%s", node->name );
-        
-        /* Print the attributes */
-        for( i = 0; node->attr[i].key; i ++ )
-        {
-                char *v = g_markup_escape_text( node->attr[i].value, -1 );
-                fprintf( stderr, " %s=\"%s\"", node->attr[i].key, v );
-                g_free( v );
-        }
-        
-        /* /> in case there's really *nothing* inside this tag, otherwise
-           just >. */
-        /* If this tag doesn't have any content at all... */
-        if( node->text == NULL && node->children == NULL )
-        {
-                fprintf( stderr, "/>\n" );
-                return;
-                /* Then we're finished! */
-        }
-        
-        /* Otherwise... */
-        fprintf( stderr, ">" );
-        
-        /* Only print the text if it contains more than whitespace (TEST). */
-        if( node->text_len > 0 )
-        {
-                for( i = 0; node->text[i] && isspace( node->text[i] ); i ++ );
-                if( node->text[i] )
-                {
-                        char *v = g_markup_escape_text( node->text, -1 );
-                        fprintf( stderr, "%s", v );
-                        g_free( v );
-                }
-        }
-        
-        if( node->children )
-                fprintf( stderr, "\n" );
-        
-        for( c = node->children; c; c = c->next )
-                xt_print( c );
-        
-        if( node->children )
-                for( c = node; c->parent; c = c->parent )
-                        fprintf( stderr, "    " );
-        
-        /* Non-empty tag is now finished. */
-        fprintf( stderr, "</%s>\n", node->name );
+        char *str = xt_to_string_i( node );
+        fprintf( stderr, "%s", str );
+        g_free( str );
 }
 

lib/xmltree.h

@@ -84 +84 @@
 struct xt_node *xt_from_string( const char *in );
 char *xt_to_string( struct xt_node *node );
+char *xt_to_string_i( struct xt_node *node );
 void xt_print( struct xt_node *node );
 struct xt_node *xt_dup( struct xt_node *node );

storage_xml.c

@@ -373 +373 @@
         
         tree = xml_generate( irc );
-        xml = xt_to_string( tree );
+        xml = xt_to_string_i( tree );
         len = strlen( xml );
         if( write( fd, xml, len ) != len ||