Changeset e31e5b8 for lib

Timestamp:

2013-04-20T13:05:55Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

dd95ce4

Parents:

9b2a8c1 (diff), bfafb99 (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:

Merging "storage" branch which I wrote long ago. It separates generation of
XML-formatted user configs from disk I/O so we can try to start using other
mechanisms to store them (a REST API or something, for example).

Location:

lib

Files:

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

lib/xmltree.c

@@ -282 +282 @@
 }
 
-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;
@@ -288 +288 @@
         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 );
         
@@ -312 +316 @@
         
         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 );
@@ -320 +328 @@
 {
         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, int text_len );
 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 );