You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/13 09:50:14 UTC
svn commit: r517593 - in /webservices/axis2/trunk/c: axiom/include/
axiom/test/soap/ rampart/src/omxmlsec/c14n/ rampart/src/secpolicy/builder/
tools/codegen/src/util/
Author: pini
Date: Tue Mar 13 01:50:12 2007
New Revision: 517593
URL: http://svn.apache.org/viewvc?view=rev&rev=517593
Log:
Dropped macros
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h
webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c
webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h Tue Mar 13 01:50:12 2007
@@ -99,14 +99,6 @@
/************ Macros *********************************************/
-#define AXIOM_CHILDREN_ITERATOR_HAS_NEXT(iterator, env) \
- axiom_children_iterator_has_next(iterator, env)
-
-#define AXIOM_CHILDREN_ITERATOR_NEXT(iterator, env) \
- axiom_children_iterator_next(iterator, env)
-
-#define AXIOM_CHILDREN_ITERATOR_RESET(iterator, env) \
- axiom_children_iterator_reset(iterator, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Tue Mar 13 01:50:12 2007
@@ -178,7 +178,7 @@
{
while (axiom_children_iterator_has_next(children_iter, env))
{
- om_node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ om_node = axiom_children_iterator_next(children_iter, env);
if (om_node)
printnode(om_node, env);
}
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c Tue Mar 13 01:50:12 2007
@@ -840,7 +840,7 @@
while(axiom_children_iterator_has_next(child_itr, ctx->env))
{
axiom_node_t *child_node = NULL;
- child_node = AXIOM_CHILDREN_ITERATOR_NEXT(child_itr, ctx->env);
+ child_node = axiom_children_iterator_next(child_itr, ctx->env);
if (child_node)
{
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/asymmetric_binding_builder.c Tue Mar 13 01:50:12 2007
@@ -62,7 +62,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/https_token_builder.c Tue Mar 13 01:50:12 2007
@@ -67,7 +67,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c Tue Mar 13 01:50:12 2007
@@ -49,7 +49,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/secpolicy_builder.c Tue Mar 13 01:50:12 2007
@@ -48,7 +48,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/security_context_token_builder.c Tue Mar 13 01:50:12 2007
@@ -57,7 +57,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_elements_builder.c Tue Mar 13 01:50:12 2007
@@ -49,7 +49,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/signed_encrypted_parts_builder.c Tue Mar 13 01:50:12 2007
@@ -54,7 +54,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/supporting_tokens_builder.c Tue Mar 13 01:50:12 2007
@@ -53,7 +53,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/symmetric_binding_builder.c Tue Mar 13 01:50:12 2007
@@ -63,7 +63,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/transport_binding_builder.c Tue Mar 13 01:50:12 2007
@@ -57,7 +57,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/username_token_builder.c Tue Mar 13 01:50:12 2007
@@ -60,7 +60,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss10_builder.c Tue Mar 13 01:50:12 2007
@@ -50,7 +50,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/wss11_builder.c Tue Mar 13 01:50:12 2007
@@ -51,7 +51,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/x509_token_builder.c Tue Mar 13 01:50:12 2007
@@ -58,7 +58,7 @@
axiom_node_t *node = NULL;
axiom_element_t *ele = NULL;
axis2_char_t *local_name = NULL;
- node = AXIOM_CHILDREN_ITERATOR_NEXT(children_iter, env);
+ node = axiom_children_iterator_next(children_iter, env);
if(node)
{
if(AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/typemapper.c Tue Mar 13 01:50:12 2007
@@ -196,7 +196,7 @@
typemapper_impl-> mapper_name =
AXIS2_STRDUP( typemapper_impl-> mapper_name, env);
it = AXIOM_ELEMENT_GET_CHILDREN(root_ele, env, root);
- while ( (child = AXIOM_CHILDREN_ITERATOR_NEXT(it, env )) != NULL )
+ while ( (child = axiom_children_iterator_next(it, env )) != NULL )
{
if(AXIOM_NODE_GET_NODE_TYPE(child, env) != AXIOM_ELEMENT)
{
@@ -214,7 +214,7 @@
it2 = AXIOM_ELEMENT_GET_CHILDREN( child_ele, env, child);
/** here on ward child referes to the childs of child */
- while ( (child = AXIOM_CHILDREN_ITERATOR_NEXT(it2, env )) != NULL )
+ while ( (child = axiom_children_iterator_next(it2, env )) != NULL )
{
if( AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT )
{
@@ -233,7 +233,7 @@
qname2str = w2c_string_add_string( qname2str, "|", env);
qname2str = w2c_string_add_string( qname2str, uri, env);
- while ( (child = AXIOM_CHILDREN_ITERATOR_NEXT(it2, env )) != NULL )
+ while ( (child = axiom_children_iterator_next(it2, env )) != NULL )
{
if( AXIOM_NODE_GET_NODE_TYPE(child, env) == AXIOM_ELEMENT )
{
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c?view=diff&rev=517593&r1=517592&r2=517593
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/xslt_utils.c Tue Mar 13 01:50:12 2007
@@ -109,9 +109,9 @@
from_ele = AXIOM_NODE_GET_DATA_ELEMENT ( from, env );
it = AXIOM_ELEMENT_GET_CHILDREN ( from_ele, env, from );
- AXIOM_CHILDREN_ITERATOR_RESET( it, env);
+ axiom_children_iterator_reset( it, env);
- while ( (from_child = AXIOM_CHILDREN_ITERATOR_NEXT( it, env )) != NULL )
+ while ( (from_child = axiom_children_iterator_next( it, env )) != NULL )
{
if ( AXIOM_NODE_GET_NODE_TYPE ( from_child, env ) == AXIOM_TEXT )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org