axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r518474 - in /webservices/axis2/trunk/c: axiom/include/ axiom/src/om/ modules/core/deployment/ rampart/src/omxmlsec/ rampart/src/omxmlsec/tokens/
Date Thu, 15 Mar 2007 04:37:30 GMT
Author: pini
Date: Wed Mar 14 21:37:17 2007
New Revision: 518474

URL: http://svn.apache.org/viewvc?view=rev&rev=518474
Log:
Dropped macros

Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h
    webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
    webservices/axis2/trunk/c/axiom/src/om/om_element.c
    webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
    webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c

Modified: webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h Wed Mar 14 21:37:17
2007
@@ -81,19 +81,6 @@
     axiom_children_qname_iterator_next(axiom_children_qname_iterator_t *iterator,
             const axis2_env_t *env);
 
-
-#define AXIOM_CHILDREN_QNAME_ITERATOR_FREE(iterator, env) \
-        axiom_children_qname_iterator_free(iterator, env)
-
-#define AXIOM_CHILDREN_QNAME_ITERATOR_REMOVE(iterator, env) \
-        axiom_children_qname_iterator_remove(iterator, env)
-
-#define AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(iterator, env) \
-        axiom_children_qname_iterator_has_next(iterator, env)
-
-#define AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(iterator, env) \
-        axiom_children_qname_iterator_next(iterator, env)
-
     /** @} */
 
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_children_qname_iterator.c Wed Mar 14 21:37:17
2007
@@ -69,7 +69,7 @@
         iterator->given_qname = AXIS2_QNAME_CLONE(given_qname, env);
         if (!(iterator->given_qname))
         {
-            AXIOM_CHILDREN_QNAME_ITERATOR_FREE(iterator, env);
+            axiom_children_qname_iterator_free(iterator, env);
             return NULL;
         }
     }

Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Wed Mar 14 21:37:17 2007
@@ -655,7 +655,7 @@
     }
     if (om_element->children_qname_iter)
     {
-        AXIOM_CHILDREN_QNAME_ITERATOR_FREE(om_element->children_qname_iter, env);
+        axiom_children_qname_iterator_free(om_element->children_qname_iter, env);
         om_element->children_qname_iter = NULL;
     }
     if (om_element->text_value)
@@ -942,7 +942,7 @@
     AXIS2_PARAM_CHECK(env->error, element_node, NULL);
     if (om_element->children_qname_iter)
     {
-        AXIOM_CHILDREN_QNAME_ITERATOR_FREE(om_element->children_qname_iter, env);
+        axiom_children_qname_iterator_free(om_element->children_qname_iter, env);
         om_element->children_qname_iter = NULL;
     }
     om_element->children_qname_iter =  axiom_children_qname_iterator_create(env,
@@ -970,14 +970,14 @@
     if (!children_iterator)
         return NULL;
 
-    if (AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(children_iterator, env))
+    if (axiom_children_qname_iterator_has_next(children_iterator, env))
     {
-        om_node =   AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(children_iterator, env);
+        om_node = axiom_children_qname_iterator_next(children_iterator, env);
 
     }
     if (om_node && (AXIOM_NODE_GET_NODE_TYPE(om_node, env) == AXIOM_ELEMENT))
     {
-        AXIOM_CHILDREN_QNAME_ITERATOR_FREE(children_iterator, env);
+        axiom_children_qname_iterator_free(children_iterator, env);
 
         if (child_node)
         {
@@ -987,7 +987,7 @@
     }
     else
     {
-        AXIOM_CHILDREN_QNAME_ITERATOR_FREE(children_iterator, env);
+        axiom_children_qname_iterator_free(children_iterator, env);
         return NULL;
     }
     return NULL;

Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Wed Mar 14 21:37:17 2007
@@ -239,7 +239,7 @@
     msg_recvs = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
             qmsgrecv, conf_node);
     AXIS2_QNAME_FREE(qmsgrecv, env);
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(msg_recvs, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(msg_recvs, env))
     {
         axiom_node_t *msg_recv_node = NULL;
         axiom_element_t *msg_recv_element = NULL;
@@ -249,7 +249,7 @@
         axis2_char_t *att_value = NULL;
 
         msg_recv_node = (axiom_node_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(msg_recvs, env);
+                axiom_children_qname_iterator_next(msg_recvs, env);
         msg_recv_element = (axiom_element_t *)
                 AXIOM_NODE_GET_DATA_ELEMENT(msg_recv_node, env);
         msg_recv = AXIS2_DESC_BUILDER_LOAD_MSG_RECV(conf_builder->desc_builder,
@@ -364,7 +364,7 @@
     AXIS2_PARAM_CHECK(env->error, module_refs, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
 
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_refs,
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(module_refs,
             env))
     {
         axiom_node_t *module_ref_node = NULL;
@@ -373,7 +373,7 @@
 
         axiom_attribute_t *module_ref_att = NULL;
         module_ref_node = (axiom_node_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(module_refs, env);
+                axiom_children_qname_iterator_next(module_refs, env);
         if (!module_ref_node)
         {
             return AXIS2_FAILURE;
@@ -434,7 +434,7 @@
     }
     if (disps)
     {
-        qname_itr_has_next = AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(disps,
+        qname_itr_has_next = axiom_children_qname_iterator_has_next(disps,
                 env);
     }
     while (AXIS2_TRUE == qname_itr_has_next)
@@ -453,13 +453,13 @@
 
         found_disp = AXIS2_TRUE;
         disp_node = (axiom_node_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(disps, env);
+                axiom_children_qname_iterator_next(disps, env);
         class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
         disp_att = AXIOM_ELEMENT_GET_ATTRIBUTE(disp_element, env, class_qname);
         AXIS2_QNAME_FREE(class_qname, env);
         if (!disp_att)
         {
-            qname_itr_has_next = AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(disps,
+            qname_itr_has_next = axiom_children_qname_iterator_has_next(disps,
                     env);
             continue;
         }
@@ -492,7 +492,7 @@
         /*disptachClas.getHandlerDesc().setParent(axisConfiguration); */
         AXIS2_PHASE_ADD_HANDLER_AT(disp_phase, env, count, handler);
         count ++;
-        qname_itr_has_next = AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(disps,
+        qname_itr_has_next = axiom_children_qname_iterator_has_next(disps,
                 env);
 
     }
@@ -535,7 +535,7 @@
 
     info = AXIS2_DEP_ENGINE_GET_PHASES_INFO(conf_builder->desc_builder->engine,
             env);
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(phase_orders, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(phase_orders, env))
     {
         axiom_node_t *phase_orders_node = NULL;
         axiom_element_t *phase_orders_element = NULL;
@@ -544,7 +544,7 @@
         axis2_char_t *flow_type = NULL;
         axis2_array_list_t *phase_list = NULL;
 
-        phase_orders_node = (axiom_node_t *) AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(
+        phase_orders_node = (axiom_node_t *) axiom_children_qname_iterator_next(
                     phase_orders, env);
         if (phase_orders_node)
         {
@@ -633,7 +633,7 @@
         return NULL;
     }
 
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(phases, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(phases, env))
     {
         axiom_node_t *phase_node = NULL;
         axiom_element_t *phase_element = NULL;
@@ -641,7 +641,7 @@
         axis2_qname_t *qattname = NULL;
         axis2_char_t *att_value = NULL;
 
-        phase_node = (axiom_node_t *) AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(
+        phase_node = (axiom_node_t *) axiom_children_qname_iterator_next(
                     phases, env);
         if (phase_node)
         {
@@ -682,7 +682,7 @@
     AXIS2_PARAM_CHECK(env->error, trs_senders, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
 
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(trs_senders,
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(trs_senders,
             env))
     {
         axis2_transport_out_desc_t *transport_out = NULL;
@@ -692,7 +692,7 @@
         axis2_qname_t *qattname = NULL;
 
         transport_node = (axiom_node_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(trs_senders, env);
+                axiom_children_qname_iterator_next(trs_senders, env);
 
         if (transport_node)
         {
@@ -931,7 +931,7 @@
     AXIS2_PARAM_CHECK(env->error, trs_recvs, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
 
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(trs_recvs,
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(trs_recvs,
             env))
     {
         axis2_transport_in_desc_t *transport_in = NULL;
@@ -941,7 +941,7 @@
         axis2_qname_t *qattname = NULL;
 
         transport_node = (axiom_node_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(trs_recvs, env);
+                axiom_children_qname_iterator_next(trs_recvs, env);
         if (transport_node)
         {
             transport_element = AXIOM_NODE_GET_DATA_ELEMENT(transport_node,
@@ -1168,7 +1168,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, module_versions, AXIS2_FAILURE);
 
-    while (AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_versions, env))
+    while (axiom_children_qname_iterator_has_next(module_versions, env))
     {
         axiom_element_t *om_element = NULL;
         axis2_char_t *name = NULL;
@@ -1176,7 +1176,7 @@
         axis2_qname_t *attribute_qname = NULL;
 
         om_element = (axiom_element_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(module_versions, env);
+                axiom_children_qname_iterator_next(module_versions, env);
         if (NULL == om_element)
         {
             continue;

Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Wed Mar 14 21:37:17 2007
@@ -370,14 +370,14 @@
     if (qchild)
         AXIS2_QNAME_FREE(qchild, env);
 
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(handlers , env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(handlers , env))
     {
         axiom_node_t *handler_node = NULL;
         axis2_handler_desc_t *handler_desc = NULL;
         axis2_status_t status = AXIS2_FAILURE;
 
         handler_node = (axiom_node_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(handlers, env);
+                axiom_children_qname_iterator_next(handlers, env);
 
         handler_desc = axis2_desc_builder_process_handler(desc_builder, env,
                 handler_node, parent);
@@ -765,7 +765,7 @@
         }
         return AXIS2_SUCCESS;
     }
-    while (AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(action_mappings, env))
+    while (axiom_children_qname_iterator_has_next(action_mappings, env))
     {
         axiom_element_t *mapping_element = NULL;
         axiom_node_t *mapping_node = NULL;
@@ -776,7 +776,7 @@
          * level
          */
         mapping_node = (axiom_node_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(action_mappings, env);
+                axiom_children_qname_iterator_next(action_mappings, env);
         mapping_element = AXIOM_NODE_GET_DATA_ELEMENT(mapping_node, env);
         temp_str = AXIOM_ELEMENT_GET_TEXT(mapping_element, env, 
             mapping_node);
@@ -823,7 +823,7 @@
     AXIS2_PARAM_CHECK(env->error, param_container, AXIS2_FAILURE);
     /*AXIS2_PARAM_CHECK(env->error, parent, AXIS2_FAILURE);*/
 
-    while (AXIS2_FALSE != AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(params, env))
+    while (AXIS2_FALSE != axiom_children_qname_iterator_has_next(params, env))
     {
         axiom_element_t *param_element = NULL;
         axiom_node_t *param_node = NULL;
@@ -839,7 +839,7 @@
          * level
          */
         param_node = (axiom_node_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(params, env);
+                axiom_children_qname_iterator_next(params, env);
         param_element = AXIOM_NODE_GET_DATA_ELEMENT(param_node, env);
         param = axis2_param_create(env, NULL, NULL);
         /* TODO Setting param_element. Do not set element like following.
@@ -969,11 +969,11 @@
     AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
     desc_builder_impl = AXIS2_INTF_TO_IMPL(desc_builder);
 
-    while (module_refs && AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_refs,
+    while (module_refs && AXIS2_TRUE == axiom_children_qname_iterator_has_next(module_refs,
             env))
     {
         moduleref = (axiom_element_t *)
-                AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(module_refs, env);
+                axiom_children_qname_iterator_next(module_refs, env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
         module_ref_attrib = AXIOM_ELEMENT_GET_ATTRIBUTE(moduleref, env, qref);
         AXIS2_QNAME_FREE(qref, env);

Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Wed Mar 14 21:37:17
2007
@@ -422,7 +422,7 @@
     builder_impl = AXIS2_INTF_TO_IMPL(module_builder);
 
     ops = axis2_array_list_create(env, 0);
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(op_itr, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(op_itr, env))
     {
         axiom_element_t *op_element = NULL;
         axiom_node_t *op_node = NULL;
@@ -443,7 +443,7 @@
         axis2_phases_info_t *info = NULL;
         axis2_op_t *op_desc = NULL;
 
-        op_node = (axiom_node_t *) AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(
+        op_node = (axiom_node_t *) axiom_children_qname_iterator_next(
                     op_itr, env);
         op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
         /* getting operation name */

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Wed Mar 14 21:37:17 2007
@@ -522,7 +522,7 @@
     builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
 
     ops = axis2_array_list_create(env, 0);
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(op_itr, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(op_itr, env))
     {
         axiom_element_t *op_element = NULL;
         axiom_node_t *op_node = NULL;
@@ -543,7 +543,7 @@
         axiom_node_t *recv_node = NULL;
         axis2_status_t status = AXIS2_FAILURE;
 
-        op_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(op_itr, env);
+        op_node = axiom_children_qname_iterator_next(op_itr, env);
         /* getting operation name */
         op_element = AXIOM_NODE_GET_DATA_ELEMENT(op_node, env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
@@ -680,14 +680,14 @@
     axis2_param_container_t *parent,
     axis2_svc_t *svc)
 {
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_confs, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(module_confs, env))
     {
         axiom_element_t *module_conf_element = NULL;
         axiom_node_t *module_conf_node = NULL;
         axiom_attribute_t *module_name_att = NULL;
         axis2_qname_t *qattname = NULL;
 
-        module_conf_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(module_confs, env);
+        module_conf_node = axiom_children_qname_iterator_next(module_confs, env);
         module_conf_element = AXIOM_NODE_GET_DATA_ELEMENT(module_conf_node,
                 env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
@@ -719,14 +719,14 @@
     AXIS2_PARAM_CHECK(env->error, module_refs, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(svc_builder);
 
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_refs, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(module_refs, env))
     {
         axiom_element_t *module_ref_element = NULL;
         axiom_node_t *module_ref_node = NULL;
         axiom_attribute_t *module_ref_att = NULL;
         axis2_qname_t *qref = NULL;
 
-        module_ref_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(module_refs, env);
+        module_ref_node = axiom_children_qname_iterator_next(module_refs, env);
         module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node,
                 env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);

Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Wed Mar 14 21:37:17
2007
@@ -215,7 +215,7 @@
         qsvc_element = NULL;
     }
 
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(svc_itr, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(svc_itr, env))
     {
         axiom_node_t *svc_node = NULL;
         axiom_element_t *svc_element = NULL;
@@ -223,7 +223,7 @@
         axis2_char_t *svc_name = NULL;
         axis2_qname_t *qattname = NULL;
 
-        svc_node = (axiom_node_t *) AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(
+        svc_node = (axiom_node_t *) axiom_children_qname_iterator_next(
                     svc_itr, env);
         svc_element = AXIOM_NODE_GET_DATA_ELEMENT(svc_node, env);
         qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
@@ -292,14 +292,14 @@
     AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
     grp_builder_impl = AXIS2_INTF_TO_IMPL(grp_builder);
 
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_refs, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(module_refs, env))
     {
         axiom_node_t *module_ref_node = NULL;
         axiom_element_t *module_ref_element = NULL;
         axiom_attribute_t *module_ref_att = NULL;
         axis2_qname_t *qref = NULL;
 
-        module_ref_node = (axiom_node_t *) AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(
+        module_ref_node = (axiom_node_t *) axiom_children_qname_iterator_next(
                     module_refs, env);
         module_ref_element = AXIOM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
         qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c Wed Mar 14 21:37:17 2007
@@ -75,11 +75,11 @@
     }
 
     qname_iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(parent_ele, env, qname, parent);
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(qname_iter , env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(qname_iter , env))
     {
 
         counter++;
-        temp_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(qname_iter, env);
+        temp_node = axiom_children_qname_iterator_next(qname_iter, env);
     }
 
     return counter;

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c?view=diff&rev=518474&r1=518473&r2=518474
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c Wed Mar 14
21:37:17 2007
@@ -104,12 +104,12 @@
     list = axis2_array_list_create(env, 0);
 
     /*Insert UIDs of nodes to the list*/
-    while (AXIS2_TRUE == AXIOM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(iter, env))
+    while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(iter, env))
     {
         axiom_node_t *dref_node = NULL;
         axis2_char_t *dref_val = NULL;
 
-        dref_node = AXIOM_CHILDREN_QNAME_ITERATOR_NEXT(iter, env);
+        dref_node = axiom_children_qname_iterator_next(iter, env);
         dref_val = oxs_token_get_data_reference(env, dref_node);
 
         axis2_array_list_add(list, env, dref_val);



---------------------------------------------------------------------
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