Changeset 101d84f

Timestamp:

2006-10-05T22:55:54Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

090f1cb

Parents:

cc2cb2d

Message:

Added max. recursion depth arguments to xt_handle()/_cleanup() to make sure
commands that still have to be handled don't get (partially) cleaned up
already.

Location:

protocols/jabber

Files:

• io.c (modified) (2 diffs)
• xmltree.c (modified) (5 diffs)
• xmltree.h (modified) (1 diff)

protocols/jabber/io.c

@@ -170 +170 @@
                 
                 /* Execute all handlers. */
-                if( !xt_handle( jd->xt, NULL ) )
+                if( !xt_handle( jd->xt, NULL, 1 ) )
                 {
                         /* Don't do anything, the handlers should have
@@ -184 +184 @@
                 
                 /* Garbage collection. */
-                xt_cleanup( jd->xt, NULL );
+                xt_cleanup( jd->xt, NULL, 1 );
                 
                 /* This is a bit hackish, unfortunately. Although xmltree

protocols/jabber/xmltree.c

@@ -152 +152 @@
 /* Find completed nodes and see if a handler has to be called. Passing
    a node isn't necessary if you want to start at the root, just pass
-   NULL. This second argument is needed for recursive calls. FIXME: Retval? */
-int xt_handle( struct xt_parser *xt, struct xt_node *node )
+   NULL. This second argument is needed for recursive calls. */
+int xt_handle( struct xt_parser *xt, struct xt_node *node, int depth )
 {
         struct xt_node *c;
@@ -159 +159 @@
         int i;
         
-        /* Let's just hope xt->root isn't NULL! */
+        /* Just in case someone likes infinite loops... */
+        if( xt->root == NULL )
+                return 0;
+        
         if( node == NULL )
-                return xt_handle( xt, xt->root );
-        
-        for( c = node->children; c; c = c->next )
-                if( !xt_handle( xt, c ) )
-                        return 0;
+                return xt_handle( xt, xt->root, depth );
+        
+        if( depth != 0 )
+                for( c = node->children; c; c = c->next )
+                        if( !xt_handle( xt, c, depth > 0 ? depth - 1 : depth ) )
+                                return 0;
         
         if( node->flags & XT_COMPLETE && !( node->flags & XT_SEEN ) )
@@ -202 +206 @@
    streams because there's no reason to keep a complete packet history
    in memory. */
-void xt_cleanup( struct xt_parser *xt, struct xt_node *node )
+void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth )
 {
         struct xt_node *c, *prev;
@@ -210 +214 @@
         
         if( node == NULL )
-                return xt_cleanup( xt, xt->root );
+                return xt_cleanup( xt, xt->root, depth );
         
         if( node->flags & XT_SEEN && node == xt->root )
@@ -246 +250 @@
                         /* This node can't be cleaned up yet, but maybe a
                            subnode can. */
-                        xt_cleanup( xt, c );
+                        if( depth != 0 )
+                                xt_cleanup( xt, c, depth > 0 ? depth - 1 : depth );
                 }
         }

protocols/jabber/xmltree.h

@@ -80 +80 @@
 void xt_reset( struct xt_parser *xt );
 int xt_feed( struct xt_parser *xt, char *text, int text_len );
-int xt_handle( struct xt_parser *xt, struct xt_node *node );
-void xt_cleanup( struct xt_parser *xt, struct xt_node *node );
+int xt_handle( struct xt_parser *xt, struct xt_node *node, int depth );
+void xt_cleanup( struct xt_parser *xt, struct xt_node *node, int depth );
 char *xt_to_string( struct xt_node *node );
 void xt_print( struct xt_node *node );