axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r413595 - in /webservices/axis2/trunk/c: axiom/include/axis2_om_child_element_iterator.h axiom/src/om/om_child_element_iterator.c util/test/unit/util/util_test.c
Date Mon, 12 Jun 2006 07:06:45 GMT
Author: damitha
Date: Mon Jun 12 00:06:45 2006
New Revision: 413595

URL: http://svn.apache.org/viewvc?rev=413595&view=rev
Log:
Made the first argument of free function to take void *

Modified:
    webservices/axis2/trunk/c/axiom/include/axis2_om_child_element_iterator.h
    webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c
    webservices/axis2/trunk/c/util/test/unit/util/util_test.c

Modified: webservices/axis2/trunk/c/axiom/include/axis2_om_child_element_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axis2_om_child_element_iterator.h?rev=413595&r1=413594&r2=413595&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_om_child_element_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axis2_om_child_element_iterator.h Mon Jun 12 00:06:45
2006
@@ -47,7 +47,7 @@
     AXIS2_DECLARE_DATA struct axis2_om_child_element_iterator_ops
     {
         axis2_status_t (AXIS2_CALL *free_fn)
-                            (axis2_om_child_element_iterator_t *iterator,
+                            (void *iterator,
                              const axis2_env_t *env);
                              
         /**
@@ -98,7 +98,7 @@
 /************ Macros *********************************************/
 
 #define AXIS2_OM_CHILD_ELEMENT_ITERATOR_FREE(iterator, env) \
-        ((iterator)->ops->free_fn(iterator, env))
+        (((axis2_om_child_element_iterator_t *) iterator)->ops->free_fn(iterator, env))
 
 #define AXIS2_OM_CHILD_ELEMENT_ITERATOR_REMOVE(iterator, env) \
         ((iterator)->ops->remove(iterator, env))

Modified: webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c?rev=413595&r1=413594&r2=413595&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_child_element_iterator.c Mon Jun 12 00:06:45
2006
@@ -20,7 +20,7 @@
  
 axis2_status_t AXIS2_CALL 
 axis2_om_child_element_iterator_free
-                    (axis2_om_child_element_iterator_t *iterator,
+                    (void *iterator,
                      const axis2_env_t *env);
                                 
 axis2_status_t AXIS2_CALL
@@ -108,14 +108,17 @@
 
 axis2_status_t AXIS2_CALL 
 axis2_om_child_element_iterator_free
-            (axis2_om_child_element_iterator_t *iterator,
+            (void *iterator,
              const axis2_env_t *env)
 {
+    axis2_om_child_element_iterator_impl_t *iterator_impl = NULL;
+    
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    if(iterator->ops)
-        AXIS2_FREE(env->allocator, iterator->ops);
+    iterator_impl = AXIS2_INTF_TO_IMPL(iterator);
+    if(iterator_impl->iterator.ops)
+        AXIS2_FREE(env->allocator, iterator_impl->iterator.ops);
         
-    AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(iterator));        
+    AXIS2_FREE(env->allocator, iterator_impl);        
     return AXIS2_SUCCESS;
 }                                
                                 

Modified: webservices/axis2/trunk/c/util/test/unit/util/util_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_test.c?rev=413595&r1=413594&r2=413595&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_test.c Mon Jun 12 00:06:45 2006
@@ -24,8 +24,8 @@
 {
     CuSuite* suite = CuSuiteNew();
    
-    /* Samisa - need to remove this as we no longer have samples in the main build
-    SUITE_ADD_TEST(suite, Testaxis2_class_loader_create_dll); */
+    /* Samisa - need to remove this as we no longer have samples in the main build*/
+    SUITE_ADD_TEST(suite, Testaxis2_class_loader_create_dll);
     SUITE_ADD_TEST(suite, Testaxis2_stream_write);
     SUITE_ADD_TEST(suite, Testaxis2_log_write);
     SUITE_ADD_TEST(suite, Testaxis2_hash_get);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message