axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r332457 - in /webservices/axis2/trunk/c: include/ modules/test/om/src/ modules/xml/om/src/
Date Fri, 11 Nov 2005 05:23:42 GMT
Author: samisa
Date: Thu Nov 10 21:23:25 2005
New Revision: 332457

URL: http://svn.apache.org/viewcvs?rev=332457&view=rev
Log:
AXIS2_OM_NODE_FREE macro renamed to AXIS2_OM_NODE_FREE_TREE

Modified:
    webservices/axis2/trunk/c/include/axis2_om_node.h
    webservices/axis2/trunk/c/modules/test/om/src/test_om.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
    webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c

Modified: webservices/axis2/trunk/c/include/axis2_om_node.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_node.h?rev=332457&r1=332456&r2=332457&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_node.h Thu Nov 10 21:23:25 2005
@@ -230,7 +230,7 @@
 AXIS2_DECLARE(axis2_om_node_t *) axis2_om_node_create (axis2_env_t **env);
 
 /** frees given node */
-#define AXIS2_OM_NODE_FREE(om_node,env) ((om_node)->ops->free(om_node,env))
+#define AXIS2_OM_NODE_FREE_TREE(om_node,env) ((om_node)->ops->free(om_node,env))
 /** adds given child to the given parent */
 
 #define AXIS2_OM_NODE_ADD_CHILD(om_node,env,parent) \

Modified: webservices/axis2/trunk/c/modules/test/om/src/test_om.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/test_om.c?rev=332457&r1=332456&r2=332457&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/test_om.c (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/test_om.c Thu Nov 10 21:23:25 2005
@@ -178,7 +178,7 @@
         printf ("\naxis2_om_node_serialize success\n");
     /* end serializing stuff */
 
-     AXIS2_OM_NODE_FREE(node1,&environment);
+     AXIS2_OM_NODE_FREE_TREE(node1,&environment);
      AXIS2_FREE(environment->allocator,om_output);
      printf ("\nDONE\n");
 

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c?rev=332457&r1=332456&r2=332457&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c Thu Nov 10 21:23:25 2005
@@ -66,7 +66,7 @@
                                              sizeof (axis2_om_comment_impl_t));
     if (!comment)
     {
-        AXIS2_OM_NODE_FREE (*node, env);
+        AXIS2_FREE ((*env)->allocator, (*node));
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
     }
 
@@ -78,7 +78,7 @@
         if (!comment->value)
         {
             AXIS2_FREE ((*env)->allocator,comment);
-            AXIS2_OM_NODE_FREE (*node, env);
+            AXIS2_FREE ((*env)->allocator, (*node));
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         }
     }

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c?rev=332457&r1=332456&r2=332457&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c Thu Nov 10 21:23:25 2005
@@ -68,7 +68,7 @@
                                              
     if (!doctype)
     {
-        AXIS2_OM_NODE_FREE ( *node, env);
+        AXIS2_FREE ((*env)->allocator, (*node));
         AXIS2_ERROR_SET((*env)->error , AXIS2_ERROR_NO_MEMORY, NULL);
     }
 
@@ -80,7 +80,7 @@
         if (!doctype->value)
         {
             AXIS2_FREE ((*env)->allocator, doctype);
-            AXIS2_OM_NODE_FREE (*node, env);
+            AXIS2_FREE ((*env)->allocator, (*node));
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
         }
     }
@@ -103,7 +103,7 @@
     {
         AXIS2_FREE((*env)->allocator, doctype);
         AXIS2_FREE ((*env)->allocator, doctype->value);
-        AXIS2_OM_NODE_FREE( *node, env);
+        AXIS2_FREE ((*env)->allocator, *node);
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
     }
 
@@ -148,5 +148,3 @@
     AXIS2_FUNC_PARAM_CHECK(om_doctype, env, NULL);
     return AXIS2_INTF_TO_IMPL(om_doctype)->value;
 }
-
-

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c?rev=332457&r1=332456&r2=332457&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_document.c Thu Nov 10 21:23:25 2005
@@ -151,7 +151,7 @@
     if (document->xml_version)
         AXIS2_FREE((*env)->allocator, document->xml_version);
     
-    AXIS2_OM_NODE_FREE(document->root_element, env);
+    AXIS2_OM_NODE_FREE_TREE(document->root_element, env);
     
     if(document->om_document.ops)
         AXIS2_FREE((*env)->allocator, document->om_document.ops);

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c?rev=332457&r1=332456&r2=332457&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_element.c Thu Nov 10 21:23:25 2005
@@ -143,7 +143,7 @@
 
     if (!element)
     {
-        AXIS2_OM_NODE_FREE ((*node), env);
+        AXIS2_FREE ((*env)->allocator, (*node));
         AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
         AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
         return NULL;
@@ -157,7 +157,7 @@
     if (!element->localname)
     {
         AXIS2_FREE ((*env)->allocator, element);
-        AXIS2_OM_NODE_FREE ( (*node), env);
+        AXIS2_FREE ((*env)->allocator, (*node));
         AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
         AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
         return NULL;
@@ -194,7 +194,7 @@
     {
         AXIS2_FREE ((*env)->allocator, element->localname);
         AXIS2_FREE ((*env)->allocator, element);
-        AXIS2_OM_NODE_FREE ( (*node), env);
+        AXIS2_FREE ((*env)->allocator,(*node));
         AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_NO_MEMORY);
         AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
         return NULL;

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c?rev=332457&r1=332456&r2=332457&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_node.c Thu Nov 10 21:23:25 2005
@@ -21,8 +21,8 @@
 /*************************** function prototypes ******************************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_om_node_free (axis2_om_node_t * om_node,
-                    axis2_env_t **env);
+axis2_om_node_free_tree (axis2_om_node_t * om_node,
+                        axis2_env_t **env);
 
 
 axis2_status_t AXIS2_CALL 
@@ -192,7 +192,7 @@
     }
     /* assign fucn pointers */
     node->om_node.ops->add_child = axis2_om_node_add_child;
-    node->om_node.ops->free = axis2_om_node_free;
+    node->om_node.ops->free = axis2_om_node_free_tree;
     node->om_node.ops->detach = axis2_om_node_detach;
     
     node->om_node.ops->insert_sibling_after = axis2_om_node_insert_sibling_after;
@@ -238,7 +238,8 @@
  *  before calling this function first free 
 */ 
 
-axis2_status_t AXIS2_CALL axis2_om_node_free(axis2_om_node_t *om_node,axis2_env_t **env)
+axis2_status_t AXIS2_CALL axis2_om_node_free_tree(axis2_om_node_t *om_node,
+                                                  axis2_env_t **env)
 {
     
     axis2_om_node_t *child_node = NULL;
@@ -252,7 +253,7 @@
         {
             
             child_node = AXIS2_OM_NODE_DETACH (AXIS2_INTF_TO_IMPL(om_node)->first_child,
env);
-            AXIS2_OM_NODE_FREE ( child_node , env);
+            AXIS2_OM_NODE_FREE_TREE ( child_node , env);
         }
     }
     

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c?rev=332457&r1=332456&r2=332457&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c Thu Nov
10 21:23:25 2005
@@ -77,7 +77,7 @@
                               
     if (!processing_instruction)
     {
-        AXIS2_OM_NODE_FREE (*node, env);
+        AXIS2_FREE ((*env)->allocator,(*node));
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
     }
     processing_instruction->value = NULL;
@@ -200,5 +200,3 @@
     AXIS2_FUNC_PARAM_CHECK(om_pi, env, NULL);
     return AXIS2_INTF_TO_IMPL(om_pi)->target;
 }
-
-

Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c?rev=332457&r1=332456&r2=332457&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_stax_builder.c Thu Nov 10 21:23:25
2005
@@ -324,13 +324,13 @@
     prev_node = AXIS2_OM_NODE_GET_PREVIOUS_SIBLING(element, env);
     if (prev_node)
     {
-        AXIS2_OM_NODE_FREE(AXIS2_OM_NODE_GET_NEXT_SIBLING(prev_node, env), env);
+        AXIS2_OM_NODE_FREE_TREE(AXIS2_OM_NODE_GET_NEXT_SIBLING(prev_node, env), env);
         AXIS2_OM_NODE_SET_NEXT_SIBLING(prev_node, env, NULL);        
     }
     else
     {
         parent = AXIS2_OM_NODE_GET_PARENT(element, env);
-        AXIS2_OM_NODE_FREE(AXIS2_OM_NODE_GET_FIRST_CHILD(parent, env), env);
+        AXIS2_OM_NODE_FREE_TREE(AXIS2_OM_NODE_GET_FIRST_CHILD(parent, env), env);
         AXIS2_OM_NODE_SET_FIRST_CHILD(parent, env, NULL);
         builder->lastnode = parent;
     }
@@ -439,7 +439,7 @@
         
         /*
         if (AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT(builder->document, env))
-             AXIS2_OM_NODE_FREE (
+             AXIS2_OM_NODE_FREE_TREE(
                 AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT(builder->document, env),env);*/
                 
         AXIS2_OM_DOCUMENT_SET_ROOT_ELEMENT(builder->document, env, element_node);



Mime
View raw message