Changeset 194 for pjproject

Timestamp:

Feb 19, 2006 1:29:42 AM (19 years ago)

Author:

bennylp

Message:

Added pj_xml_clone()

Location:

pjproject/trunk/pjlib-util

Files:

• include/pjlib-util/xml.h (modified) (1 diff)
• src/pjlib-util/xml.c (modified) (5 diffs)

pjproject/trunk/pjlib-util/include/pjlib-util/xml.h

@@ -98 +98 @@
 
 /**
+ * Clone XML node and all subnodes.
+ *
+ * @param pool      Pool to allocate memory for new nodes.
+ * @param rhs       The node to clone.
+ *
+ * @return          Cloned XML node, or NULL on fail.
+ */
+PJ_DECL(pj_xml_node*) pj_xml_clone( pj_pool_t *pool, const pj_xml_node *rhs);
+
+
+/**
  * Create an empty node.
  *

pjproject/trunk/pjlib-util/src/pjlib-util/xml.c

@@ -47 +47 @@
 static pj_xml_attr *alloc_attr( pj_pool_t *pool )
 {
-    return pj_pool_calloc(pool, 1, sizeof(pj_xml_attr));
+    return pj_pool_zalloc(pool, sizeof(pj_xml_attr));
 }
 
@@ -115 +115 @@
         }
         
-        pj_list_insert_before( &node->attr_head, attr );
+        pj_list_push_back( &node->attr_head, attr );
     }
 
@@ -132 +132 @@
     while (*scanner->curptr == '<' && *(scanner->curptr+1) != '/') {
         pj_xml_node *sub_node = xml_parse_node(pool, scanner);
-        pj_list_insert_before( &node->node_head, sub_node );
+        pj_list_push_back( &node->node_head, sub_node );
     }
 
@@ -332 +332 @@
 PJ_DEF(void) pj_xml_add_node( pj_xml_node *parent, pj_xml_node *node )
 {
-    pj_list_insert_before(&parent->node_head, node);
+    pj_list_push_back(&parent->node_head, node);
 }
 
 PJ_DEF(void) pj_xml_add_attr( pj_xml_node *node, pj_xml_attr *attr )
 {
-    pj_list_insert_before(&node->attr_head, attr);
+    pj_list_push_back(&node->attr_head, attr);
 }
 
@@ -410 +410 @@
 }
 
+
+PJ_DEF(pj_xml_node*) pj_xml_clone( pj_pool_t *pool, const pj_xml_node *rhs)
+{
+    pj_xml_node *node;
+    const pj_xml_attr *r_attr;
+    const pj_xml_node *child;
+
+    node = alloc_node(pool);
+
+    pj_strdup(pool, &node->name, &rhs->name);
+    pj_strdup(pool, &node->content, &rhs->content);
+
+    /* Clone all attributes */
+    r_attr = rhs->attr_head.next;
+    while (r_attr != &rhs->attr_head) {
+
+        pj_xml_attr *attr;
+
+        attr = alloc_attr(pool);
+        pj_strdup(pool, &attr->name, &r_attr->name);
+        pj_strdup(pool, &attr->value, &r_attr->value);
+
+        pj_list_push_back(&node->attr_head, attr);
+
+        r_attr = r_attr->next;
+    }
+
+    /* Clone all child nodes. */
+    child = rhs->node_head.next;
+    while (child != (pj_xml_node*) &rhs->node_head) {
+        pj_xml_node *new_child;
+
+        new_child = pj_xml_clone(pool, child);
+        pj_list_push_back(&node->node_head, new_child);
+
+        child = child->next;
+    }
+
+    return node;
+}