Changeset 4bbcba3

Timestamp:

2008-02-16T22:40:38Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e6648bf

Parents:

add23a2

Message:

Moved xmltree handlers initialization to xt_new().

Files:

• lib/xmltree.c (modified) (1 diff)
• lib/xmltree.h (modified) (2 diffs)
• protocols/jabber/io.c (modified) (1 diff)

lib/xmltree.c

@@ -111 +111 @@
 };
 
-struct xt_parser *xt_new( gpointer data )
+struct xt_parser *xt_new( const struct xt_handler_entry *handlers, gpointer data )
 {
         struct xt_parser *xt = g_new0( struct xt_parser, 1 );
         
         xt->data = data;
+        xt->handlers = handlers;
         xt_reset( xt );
         

lib/xmltree.h

@@ -71 +71 @@
         struct xt_node *cur;
         
-        struct xt_handler_entry *handlers;
+        const struct xt_handler_entry *handlers;
         gpointer data;
         
@@ -77 +77 @@
 };
 
-struct xt_parser *xt_new( gpointer data );
+struct xt_parser *xt_new( const struct xt_handler_entry *handlers, gpointer data );
 void xt_reset( struct xt_parser *xt );
 int xt_feed( struct xt_parser *xt, char *text, int text_len );

protocols/jabber/io.c

@@ -521 +521 @@
            from the server too. */
         xt_free( jd->xt );      /* In case we're RE-starting. */
-        jd->xt = xt_new( ic );
-        jd->xt->handlers = (struct xt_handler_entry*) jabber_handlers;
+        jd->xt = xt_new( jabber_handlers, ic );
         
         if( jd->r_inpa <= 0 )