You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/17 08:48:08 UTC
svn commit: r519258 [4/4] - in /webservices/axis2/trunk/c/woden: include/
samples/ samples/wsdl10/ src/builder/ src/builder/wsdl10/ src/schema/
src/types/ src/util/ src/wsdl/ src/wsdl10/ src/wsdl10/extensions/
src/wsdl10/extensions/soap/ src/wsdl20/ sr...
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c Sat Mar 17 00:48:05 2007
@@ -1057,12 +1057,12 @@
/* TODO free f_parent */
if (desc_impl->f_target_namespc)
{
- AXIS2_URI_FREE(desc_impl->f_target_namespc, env);
+ axis2_uri_free(desc_impl->f_target_namespc, env);
desc_impl->f_target_namespc = NULL;
}
if (desc_impl->f_doc_base_uri)
{
- AXIS2_URI_FREE(desc_impl->f_doc_base_uri, env);
+ axis2_uri_free(desc_impl->f_doc_base_uri, env);
desc_impl->f_doc_base_uri = NULL;
}
if (desc_impl->f_import_elements)
@@ -1093,7 +1093,7 @@
{
axis2_hash_this(i, NULL, NULL, &v);
namespc = (axis2_uri_t *) v;
- AXIS2_URI_FREE(namespc, env);
+ axis2_uri_free(namespc, env);
}
axis2_hash_free(desc_impl->f_namespcs, env);
desc_impl->f_namespcs = NULL;
@@ -1404,7 +1404,7 @@
axis2_qname_t *qname_l = NULL;
void *ed = axis2_array_list_get(desc_impl->f_all_element_decls, env, i);
qname_l = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
- if (0 == AXIS2_QNAME_EQUALS(qname, env, qname_l))
+ if (0 == axis2_qname_equals(qname, env, qname_l))
{
el_decl = ed;
break;
@@ -1456,7 +1456,7 @@
axis2_qname_t *qname_l = NULL;
void *ed = axis2_array_list_get(desc_impl->f_all_element_decls, env, i);
qname_l = WODEN_TYPE_DEF_GET_QNAME(ed, env);
- if (0 == AXIS2_QNAME_EQUALS(qname, env, qname_l))
+ if (0 == axis2_qname_equals(qname, env, qname_l))
{
type_def = ed;
break;
@@ -1501,11 +1501,11 @@
"WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
if (desc_impl->f_doc_base_uri)
{
- AXIS2_URI_FREE(desc_impl->f_doc_base_uri, env);
+ axis2_uri_free(desc_impl->f_doc_base_uri, env);
desc_impl->f_doc_base_uri = NULL;
}
- desc_impl->f_doc_base_uri = AXIS2_URI_CLONE(doc_base_uri, env);
+ desc_impl->f_doc_base_uri = axis2_uri_clone(doc_base_uri, env);
return AXIS2_SUCCESS;
}
@@ -1542,11 +1542,11 @@
"WODEN_WSDL10_DESC", AXIS2_HASH_KEY_STRING));
if (desc_impl->f_target_namespc)
{
- AXIS2_URI_FREE(desc_impl->f_target_namespc, env);
+ axis2_uri_free(desc_impl->f_target_namespc, env);
desc_impl->f_target_namespc = NULL;
}
- desc_impl->f_target_namespc = AXIS2_URI_CLONE(namespc, env);
+ desc_impl->f_target_namespc = axis2_uri_clone(namespc, env);
return AXIS2_SUCCESS;
}
@@ -1585,7 +1585,7 @@
pfx = (prefix) ? prefix : "";
if (namespc)
axis2_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING,
- AXIS2_URI_CLONE(namespc, env));
+ axis2_uri_clone(namespc, env));
else
axis2_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING, NULL);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_endpoint.c Sat Mar 17 00:48:05 2007
@@ -771,7 +771,7 @@
if (endpoint_impl->f_binding_qname)
{
- AXIS2_QNAME_FREE(endpoint_impl->f_binding_qname, env);
+ axis2_qname_free(endpoint_impl->f_binding_qname, env);
endpoint_impl->f_binding_qname = NULL;
}
@@ -783,7 +783,7 @@
if (endpoint_impl->f_address)
{
- AXIS2_URI_FREE(endpoint_impl->f_address, env);
+ axis2_uri_free(endpoint_impl->f_address, env);
endpoint_impl->f_address = NULL;
}
@@ -1001,10 +1001,10 @@
if (endpoint_impl->f_binding_qname)
{
- AXIS2_QNAME_FREE(endpoint_impl->f_binding_qname, env);
+ axis2_qname_free(endpoint_impl->f_binding_qname, env);
}
- endpoint_impl->f_binding_qname = AXIS2_QNAME_CLONE(binding_qname, env);
+ endpoint_impl->f_binding_qname = axis2_qname_clone(binding_qname, env);
return AXIS2_SUCCESS;
}
@@ -1056,11 +1056,11 @@
if (endpoint_impl->f_address)
{
- AXIS2_URI_FREE(endpoint_impl->f_address, env);
+ axis2_uri_free(endpoint_impl->f_address, env);
endpoint_impl->f_address = NULL;
}
- endpoint_impl->f_address = AXIS2_URI_CLONE(uri, env);
+ endpoint_impl->f_address = axis2_uri_clone(uri, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_fault_ref.c Sat Mar 17 00:48:05 2007
@@ -605,13 +605,13 @@
if (interface_fault_ref_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_fault_ref_impl->f_qname, env);
+ axis2_qname_free(interface_fault_ref_impl->f_qname, env);
interface_fault_ref_impl->f_qname = NULL;
}
if (interface_fault_ref_impl->f_msg_qname)
{
- AXIS2_QNAME_FREE(interface_fault_ref_impl->f_msg_qname, env);
+ axis2_qname_free(interface_fault_ref_impl->f_msg_qname, env);
interface_fault_ref_impl->f_msg_qname = NULL;
}
@@ -806,9 +806,9 @@
if (interface_fault_ref_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_fault_ref_impl->f_qname, env);
+ axis2_qname_free(interface_fault_ref_impl->f_qname, env);
}
- interface_fault_ref_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ interface_fault_ref_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -846,9 +846,9 @@
if (interface_fault_ref_impl->f_msg_qname)
{
- AXIS2_QNAME_FREE(interface_fault_ref_impl->f_msg_qname, env);
+ axis2_qname_free(interface_fault_ref_impl->f_msg_qname, env);
}
- interface_fault_ref_impl->f_msg_qname = AXIS2_QNAME_CLONE(element, env);
+ interface_fault_ref_impl->f_msg_qname = axis2_qname_clone(element, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_interface_msg_ref.c Sat Mar 17 00:48:05 2007
@@ -725,13 +725,13 @@
if (interface_msg_ref_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_msg_ref_impl->f_qname, env);
+ axis2_qname_free(interface_msg_ref_impl->f_qname, env);
interface_msg_ref_impl->f_qname = NULL;
}
if (interface_msg_ref_impl->f_msg_qname)
{
- AXIS2_QNAME_FREE(interface_msg_ref_impl->f_msg_qname, env);
+ axis2_qname_free(interface_msg_ref_impl->f_msg_qname, env);
interface_msg_ref_impl->f_msg_qname = NULL;
}
@@ -992,9 +992,9 @@
if (interface_msg_ref_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_msg_ref_impl->f_qname, env);
+ axis2_qname_free(interface_msg_ref_impl->f_qname, env);
}
- interface_msg_ref_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ interface_msg_ref_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -1067,9 +1067,9 @@
if (interface_msg_ref_impl->f_msg_qname)
{
- AXIS2_QNAME_FREE(interface_msg_ref_impl->f_msg_qname, env);
+ axis2_qname_free(interface_msg_ref_impl->f_msg_qname, env);
}
- interface_msg_ref_impl->f_msg_qname = AXIS2_QNAME_CLONE(element, env);
+ interface_msg_ref_impl->f_msg_qname = axis2_qname_clone(element, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c Sat Mar 17 00:48:05 2007
@@ -617,13 +617,13 @@
if (svc_impl->f_qname)
{
- AXIS2_QNAME_FREE(svc_impl->f_qname, env);
+ axis2_qname_free(svc_impl->f_qname, env);
svc_impl->f_qname = NULL;
}
if (svc_impl->f_interface_qname)
{
- AXIS2_QNAME_FREE(svc_impl->f_interface_qname, env);
+ axis2_qname_free(svc_impl->f_interface_qname, env);
svc_impl->f_interface_qname = NULL;
}
@@ -831,9 +831,9 @@
if (svc_impl->f_qname)
{
- AXIS2_QNAME_FREE(svc_impl->f_qname, env);
+ axis2_qname_free(svc_impl->f_qname, env);
}
- svc_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ svc_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -853,10 +853,10 @@
if (svc_impl->f_interface_qname)
{
- AXIS2_QNAME_FREE(svc_impl->f_interface_qname, env);
+ axis2_qname_free(svc_impl->f_interface_qname, env);
}
- svc_impl->f_interface_qname = AXIS2_QNAME_CLONE(interface_qname, env);
+ svc_impl->f_interface_qname = axis2_qname_clone(interface_qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_exts.c Sat Mar 17 00:48:05 2007
@@ -257,7 +257,7 @@
if (binding_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_exts_impl->qname, env);
+ axis2_qname_free(binding_exts_impl->qname, env);
binding_exts_impl->qname = NULL;
}
woden_soap_binding_exts_free_ops(binding_exts, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_exts.c Sat Mar 17 00:48:05 2007
@@ -260,7 +260,7 @@
if (binding_fault_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_fault_exts_impl->qname, env);
+ axis2_qname_free(binding_fault_exts_impl->qname, env);
binding_fault_exts_impl->qname = NULL;
}
woden_soap_binding_fault_exts_free_ops(binding_fault_exts, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_fault_ref_exts.c Sat Mar 17 00:48:05 2007
@@ -228,7 +228,7 @@
if (binding_fault_ref_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_fault_ref_exts_impl->qname, env);
+ axis2_qname_free(binding_fault_ref_exts_impl->qname, env);
binding_fault_ref_exts_impl->qname = NULL;
}
woden_soap_binding_fault_ref_exts_free_ops(binding_fault_ref_exts, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_msg_ref_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_msg_ref_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_msg_ref_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_msg_ref_exts.c Sat Mar 17 00:48:05 2007
@@ -238,7 +238,7 @@
if (binding_msg_ref_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_msg_ref_exts_impl->qname, env);
+ axis2_qname_free(binding_msg_ref_exts_impl->qname, env);
binding_msg_ref_exts_impl->qname = NULL;
}
woden_soap_binding_msg_ref_exts_free_ops(binding_msg_ref_exts, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_binding_op_exts.c Sat Mar 17 00:48:05 2007
@@ -249,7 +249,7 @@
if (binding_op_exts_impl->qname)
{
- AXIS2_QNAME_FREE(binding_op_exts_impl->qname, env);
+ axis2_qname_free(binding_op_exts_impl->qname, env);
binding_op_exts_impl->qname = NULL;
}
woden_soap_binding_op_exts_free_ops(binding_op_exts, env);
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c Sat Mar 17 00:48:05 2007
@@ -628,7 +628,7 @@
if (header_block_impl->f_ext_element_type)
{
- AXIS2_QNAME_FREE(header_block_impl->f_ext_element_type, env);
+ axis2_qname_free(header_block_impl->f_ext_element_type, env);
header_block_impl->f_ext_element_type = NULL;
}
@@ -646,7 +646,7 @@
if (header_block_impl->f_element_decl_qn)
{
- AXIS2_QNAME_FREE(header_block_impl->f_element_decl_qn, env);
+ axis2_qname_free(header_block_impl->f_element_decl_qn, env);
header_block_impl->f_element_decl_qn = NULL;
}
@@ -876,11 +876,11 @@
if (header_block_impl->f_element_decl_qn)
{
- AXIS2_QNAME_FREE(header_block_impl->f_element_decl_qn, env);
+ axis2_qname_free(header_block_impl->f_element_decl_qn, env);
header_block_impl->f_element_decl_qn = NULL;
}
- header_block_impl->f_element_decl_qn = AXIS2_QNAME_CLONE(qname, env);
+ header_block_impl->f_element_decl_qn = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
@@ -1046,11 +1046,11 @@
if (header_block_impl->f_ext_element_type)
{
- AXIS2_QNAME_FREE(header_block_impl->f_ext_element_type, env);
+ axis2_qname_free(header_block_impl->f_ext_element_type, env);
header_block_impl->f_ext_element_type = NULL;
}
- header_block_impl->f_ext_element_type = AXIS2_QNAME_CLONE(qname, env);
+ header_block_impl->f_ext_element_type = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block_deserializer.c Sat Mar 17 00:48:05 2007
@@ -356,7 +356,7 @@
}
must_understand = axiom_element_get_attribute_value_by_name(ext_el, env,
WODEN_ATTR_MUSTUNDERSTAND);
- if (must_understand && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, must_understand))
+ if (must_understand && 0 == axis2_strcmp(WODEN_VALUE_TRUE, must_understand))
understood = AXIS2_TRUE;
else
understood = AXIS2_FALSE;
@@ -365,7 +365,7 @@
req = axiom_element_get_attribute_value_by_name(ext_el, env,
WODEN_ATTR_REQUIRED);
- if (req && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, req))
+ if (req && 0 == axis2_strcmp(WODEN_VALUE_TRUE, req))
required = AXIS2_TRUE;
else
required = AXIS2_FALSE;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c Sat Mar 17 00:48:05 2007
@@ -551,7 +551,7 @@
if (module_impl->f_ext_element_type)
{
- AXIS2_QNAME_FREE(module_impl->f_ext_element_type, env);
+ axis2_qname_free(module_impl->f_ext_element_type, env);
module_impl->f_ext_element_type = NULL;
}
@@ -569,7 +569,7 @@
if (module_impl->f_ref)
{
- AXIS2_URI_FREE(module_impl->f_ref, env);
+ axis2_uri_free(module_impl->f_ref, env);
module_impl->f_ref = NULL;
}
@@ -752,11 +752,11 @@
if (module_impl->f_ref)
{
- AXIS2_URI_FREE(module_impl->f_ref, env);
+ axis2_uri_free(module_impl->f_ref, env);
module_impl->f_ref = NULL;
}
- module_impl->f_ref = AXIS2_URI_CLONE(uri, env);
+ module_impl->f_ref = axis2_uri_clone(uri, env);
return AXIS2_SUCCESS;
@@ -863,11 +863,11 @@
if (module_impl->f_ext_element_type)
{
- AXIS2_QNAME_FREE(module_impl->f_ext_element_type, env);
+ axis2_qname_free(module_impl->f_ext_element_type, env);
module_impl->f_ext_element_type = NULL;
}
- module_impl->f_ext_element_type = AXIS2_QNAME_CLONE(qname, env);
+ module_impl->f_ext_element_type = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module_deserializer.c Sat Mar 17 00:48:05 2007
@@ -351,7 +351,7 @@
}
req = axiom_element_get_attribute_value_by_name(el, env,
WODEN_ATTR_REQUIRED);
- if (req && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, req))
+ if (req && 0 == axis2_strcmp(WODEN_VALUE_TRUE, req))
required = AXIS2_TRUE;
else
required = AXIS2_FALSE;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c Sat Mar 17 00:48:05 2007
@@ -339,7 +339,7 @@
axis2_hash_set(registry_impl->deserializer_reg, parent_type,
AXIS2_HASH_KEY_STRING, inner_deserializer_reg);
}
- element_type = AXIS2_QNAME_TO_STRING(element_qtype, env);
+ element_type = axis2_qname_to_string(element_qtype, env);
axis2_hash_set(inner_deserializer_reg, element_type, AXIS2_HASH_KEY_STRING,
ed);
return AXIS2_SUCCESS;
@@ -378,7 +378,7 @@
inner_deserializer_reg = axis2_hash_get(registry_impl->deserializer_reg,
parent_type, AXIS2_HASH_KEY_STRING);
- elem_name = AXIS2_QNAME_TO_STRING(element_type, env);
+ elem_name = axis2_qname_to_string(element_type, env);
if (inner_deserializer_reg)
{
ed = axis2_hash_get(inner_deserializer_reg, elem_name,
@@ -417,7 +417,7 @@
inner_ext_attr_reg = axis2_hash_get(registry_impl->ext_attr_reg,
parent_class, AXIS2_HASH_KEY_STRING);
- elem_name = AXIS2_QNAME_TO_STRING(elem_qn, env);
+ elem_name = axis2_qname_to_string(elem_qn, env);
if (inner_ext_attr_reg)
{
element = axis2_hash_get(inner_ext_attr_reg, elem_name,
@@ -504,7 +504,7 @@
axis2_hash_set(registry_impl->ext_element_reg, parent_type,
AXIS2_HASH_KEY_STRING, inner_ext_type_reg);
}
- element_type = AXIS2_QNAME_TO_STRING(element_qtype, env);
+ element_type = axis2_qname_to_string(element_qtype, env);
axis2_hash_set(inner_ext_type_reg, element_type, AXIS2_HASH_KEY_STRING,
element);
return AXIS2_SUCCESS;
@@ -547,7 +547,7 @@
axis2_hash_set(registry_impl->ext_attr_reg, owner_class,
AXIS2_HASH_KEY_STRING, inner_ext_attr_reg);
}
- attr_name = AXIS2_QNAME_TO_STRING(attr_qname, env);
+ attr_name = axis2_qname_to_string(attr_qname, env);
axis2_hash_set(inner_ext_attr_reg, attr_name, AXIS2_HASH_KEY_STRING, attr);
return AXIS2_SUCCESS;
}
@@ -581,7 +581,7 @@
inner_ext_attr_reg = axis2_hash_get(registry_impl->ext_attr_reg,
parent_class, AXIS2_HASH_KEY_STRING);
- attr_name = AXIS2_QNAME_TO_STRING(attr_qn, env);
+ attr_name = axis2_qname_to_string(attr_qn, env);
if (inner_ext_attr_reg)
{
attr = axis2_hash_get(inner_ext_attr_reg, attr_name,
@@ -621,7 +621,7 @@
axis2_hash_set(registry_impl->comp_ext_reg, parent_class,
AXIS2_HASH_KEY_STRING, inner_comp_ext_reg);
}
- namespc = AXIS2_URI_TO_STRING(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
axis2_hash_set(inner_comp_ext_reg, namespc, AXIS2_HASH_KEY_STRING, comp_ext);
return AXIS2_SUCCESS;
}
@@ -651,7 +651,7 @@
inner_comp_ext_reg = axis2_hash_get(registry_impl->comp_ext_reg,
parent_class, AXIS2_HASH_KEY_STRING);
- namespc = AXIS2_URI_TO_STRING(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
+ namespc = axis2_uri_to_string(ext_namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
if (inner_comp_ext_reg)
{
comp_ext = axis2_hash_get(inner_comp_ext_reg, namespc,
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_fault.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_fault.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_fault.c Sat Mar 17 00:48:05 2007
@@ -684,7 +684,7 @@
if (binding_fault_impl->f_ref)
{
- AXIS2_QNAME_FREE(binding_fault_impl->f_ref, env);
+ axis2_qname_free(binding_fault_impl->f_ref, env);
binding_fault_impl->f_ref = NULL;
}
@@ -865,9 +865,9 @@
if (binding_fault_impl->f_ref)
{
- AXIS2_QNAME_FREE(binding_fault_impl->f_ref, env);
+ axis2_qname_free(binding_fault_impl->f_ref, env);
}
- binding_fault_impl->f_ref = AXIS2_QNAME_CLONE(qname, env);
+ binding_fault_impl->f_ref = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c Sat Mar 17 00:48:05 2007
@@ -803,7 +803,7 @@
if (binding_op_impl->f_ref)
{
- AXIS2_QNAME_FREE(binding_op_impl->f_ref, env);
+ axis2_qname_free(binding_op_impl->f_ref, env);
binding_op_impl->f_ref = NULL;
}
@@ -1044,10 +1044,10 @@
if (binding_op_impl->f_ref)
{
- AXIS2_QNAME_FREE(binding_op_impl->f_ref, env);
+ axis2_qname_free(binding_op_impl->f_ref, env);
binding_op_impl->f_ref = NULL;
}
- binding_op_impl->f_ref = AXIS2_QNAME_CLONE(qname, env);
+ binding_op_impl->f_ref = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c Sat Mar 17 00:48:05 2007
@@ -490,8 +490,8 @@
qname = (axis2_qname_t *) axis2_array_list_get(qnames, env, i);
if (qname)
- namespc = AXIS2_QNAME_GET_URI(qname, env);
- if (0 == AXIS2_STRCMP(namespc, schema_tns))
+ namespc = axis2_qname_get_uri(qname, env);
+ if (0 == axis2_strcmp(namespc, schema_tns))
{
void *ed = NULL;
@@ -547,8 +547,8 @@
qname = (axis2_qname_t *) axis2_array_list_get(qnames, env, i);
if (qname)
- namespc = AXIS2_QNAME_GET_URI(qname, env);
- if (0 == AXIS2_STRCMP(namespc, schema_tns))
+ namespc = axis2_qname_get_uri(qname, env);
+ if (0 == axis2_strcmp(namespc, schema_tns))
{
void *td = NULL;
@@ -788,7 +788,7 @@
build_properties(builder, env, property_elements, msg);
msg_content_model = WODEN_INTERFACE_MSG_REF_GET_MSG_CONTENT_MODEL(
msg, env);
- if (0 == AXIS2_STRCMP(WODEN_NMTOKEN_ELEMENT, msg_content_model))
+ if (0 == axis2_strcmp(WODEN_NMTOKEN_ELEMENT, msg_content_model))
{
axis2_qname_t *qname = NULL;
msg = woden_interface_msg_ref_to_interface_msg_ref_element(msg, env);
@@ -1072,8 +1072,8 @@
* extensions can be registered in some way and interpreted here at run time.
*/
binding_type = WODEN_BINDING_GET_TYPE(binding, env);
- binding_type_str = AXIS2_URI_TO_STRING(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
- if (0 == AXIS2_STRCMP(WODEN_URI_NS_SOAP, binding_type_str))
+ binding_type_str = axis2_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
+ if (0 == axis2_strcmp(WODEN_URI_NS_SOAP, binding_type_str))
{
void *sbe = NULL;
axis2_uri_t *uri_ns_soap = NULL;
@@ -1170,8 +1170,8 @@
parent_element = WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_fault, env);
parent_element = woden_binding_to_binding_element(parent_element, env);
binding_type = WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
- binding_type_str = AXIS2_URI_TO_STRING(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
- if (0 == AXIS2_STRCMP(WODEN_URI_NS_SOAP, binding_type_str))
+ binding_type_str = axis2_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
+ if (0 == axis2_strcmp(WODEN_URI_NS_SOAP, binding_type_str))
{
axis2_uri_t *uri_ns_soap = axis2_uri_parse_string(env, WODEN_URI_NS_SOAP);
@@ -1260,8 +1260,8 @@
parent_element = WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_op, env);
parent_element = woden_binding_to_binding_element(parent_element, env);
binding_type = WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
- binding_type_str = AXIS2_URI_TO_STRING(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
- if (0 == AXIS2_STRCMP(WODEN_URI_NS_SOAP, binding_type_str))
+ binding_type_str = axis2_uri_to_string(binding_type, env, AXIS2_URI_UNP_OMITUSERINFO);
+ if (0 == axis2_strcmp(WODEN_URI_NS_SOAP, binding_type_str))
{
axis2_uri_t *uri_ns_soap = axis2_uri_parse_string(env, WODEN_URI_NS_SOAP);
/*
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c Sat Mar 17 00:48:05 2007
@@ -1005,12 +1005,12 @@
/* TODO free f_parent */
if (desc_impl->f_target_namespc)
{
- AXIS2_URI_FREE(desc_impl->f_target_namespc, env);
+ axis2_uri_free(desc_impl->f_target_namespc, env);
desc_impl->f_target_namespc = NULL;
}
if (desc_impl->f_doc_base_uri)
{
- AXIS2_URI_FREE(desc_impl->f_doc_base_uri, env);
+ axis2_uri_free(desc_impl->f_doc_base_uri, env);
desc_impl->f_doc_base_uri = NULL;
}
/* TODO free f_namespcs */
@@ -1288,7 +1288,7 @@
axis2_qname_t *qname_l = NULL;
void *ed = axis2_array_list_get(desc_impl->f_all_element_decls, env, i);
qname_l = WODEN_ELEMENT_DECL_GET_QNAME(ed, env);
- if (0 == AXIS2_QNAME_EQUALS(qname, env, qname_l))
+ if (0 == axis2_qname_equals(qname, env, qname_l))
{
el_decl = ed;
break;
@@ -1340,7 +1340,7 @@
axis2_qname_t *qname_l = NULL;
void *ed = axis2_array_list_get(desc_impl->f_all_element_decls, env, i);
qname_l = WODEN_TYPE_DEF_GET_QNAME(ed, env);
- if (0 == AXIS2_QNAME_EQUALS(qname, env, qname_l))
+ if (0 == axis2_qname_equals(qname, env, qname_l))
{
type_def = ed;
break;
@@ -1385,11 +1385,11 @@
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
if (desc_impl->f_doc_base_uri)
{
- AXIS2_URI_FREE(desc_impl->f_doc_base_uri, env);
+ axis2_uri_free(desc_impl->f_doc_base_uri, env);
desc_impl->f_doc_base_uri = NULL;
}
- desc_impl->f_doc_base_uri = AXIS2_URI_CLONE(doc_base_uri, env);
+ desc_impl->f_doc_base_uri = axis2_uri_clone(doc_base_uri, env);
return AXIS2_SUCCESS;
}
@@ -1426,11 +1426,11 @@
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
if (desc_impl->f_target_namespc)
{
- AXIS2_URI_FREE(desc_impl->f_target_namespc, env);
+ axis2_uri_free(desc_impl->f_target_namespc, env);
desc_impl->f_target_namespc = NULL;
}
- desc_impl->f_target_namespc = AXIS2_URI_CLONE(namespc, env);
+ desc_impl->f_target_namespc = axis2_uri_clone(namespc, env);
return AXIS2_SUCCESS;
}
@@ -1469,7 +1469,7 @@
pfx = (prefix) ? prefix : "";
if (namespc)
axis2_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING,
- AXIS2_URI_CLONE(namespc, env));
+ axis2_uri_clone(namespc, env));
else
axis2_hash_set(desc_impl->f_namespcs, pfx, AXIS2_HASH_KEY_STRING, NULL);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_endpoint.c Sat Mar 17 00:48:05 2007
@@ -720,7 +720,7 @@
if (endpoint_impl->f_binding_qname)
{
- AXIS2_QNAME_FREE(endpoint_impl->f_binding_qname, env);
+ axis2_qname_free(endpoint_impl->f_binding_qname, env);
endpoint_impl->f_binding_qname = NULL;
}
@@ -732,7 +732,7 @@
if (endpoint_impl->f_address)
{
- AXIS2_URI_FREE(endpoint_impl->f_address, env);
+ axis2_uri_free(endpoint_impl->f_address, env);
endpoint_impl->f_address = NULL;
}
@@ -950,10 +950,10 @@
if (endpoint_impl->f_binding_qname)
{
- AXIS2_QNAME_FREE(endpoint_impl->f_binding_qname, env);
+ axis2_qname_free(endpoint_impl->f_binding_qname, env);
}
- endpoint_impl->f_binding_qname = AXIS2_QNAME_CLONE(binding_qname, env);
+ endpoint_impl->f_binding_qname = axis2_qname_clone(binding_qname, env);
return AXIS2_SUCCESS;
}
@@ -1005,11 +1005,11 @@
if (endpoint_impl->f_address)
{
- AXIS2_URI_FREE(endpoint_impl->f_address, env);
+ axis2_uri_free(endpoint_impl->f_address, env);
endpoint_impl->f_address = NULL;
}
- endpoint_impl->f_address = AXIS2_URI_CLONE(uri, env);
+ endpoint_impl->f_address = axis2_uri_clone(uri, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault.c Sat Mar 17 00:48:05 2007
@@ -588,7 +588,7 @@
if (interface_fault_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_fault_impl->f_qname, env);
+ axis2_qname_free(interface_fault_impl->f_qname, env);
interface_fault_impl->f_qname = NULL;
}
@@ -601,7 +601,7 @@
if (interface_fault_impl->f_element_qname)
{
- AXIS2_QNAME_FREE(interface_fault_impl->f_element_qname, env);
+ axis2_qname_free(interface_fault_impl->f_element_qname, env);
interface_fault_impl->f_element_qname = NULL;
}
@@ -803,9 +803,9 @@
if (interface_fault_impl->f_qname)
{
- AXIS2_QNAME_FREE(interface_fault_impl->f_qname, env);
+ axis2_qname_free(interface_fault_impl->f_qname, env);
}
- interface_fault_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ interface_fault_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -826,9 +826,9 @@
if (!interface_fault_impl->f_element_qname)
{
- AXIS2_QNAME_FREE(interface_fault_impl->f_element_qname, env);
+ axis2_qname_free(interface_fault_impl->f_element_qname, env);
}
- interface_fault_impl->f_element_qname = AXIS2_QNAME_CLONE(qname, env);
+ interface_fault_impl->f_element_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault_ref.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_fault_ref.c Sat Mar 17 00:48:05 2007
@@ -643,7 +643,7 @@
if (interface_fault_ref_impl->f_ref)
{
- AXIS2_QNAME_FREE(interface_fault_ref_impl->f_ref, env);
+ axis2_qname_free(interface_fault_ref_impl->f_ref, env);
interface_fault_ref_impl->f_ref = NULL;
}
@@ -854,9 +854,9 @@
if (interface_fault_ref_impl->f_ref)
{
- AXIS2_QNAME_FREE(interface_fault_ref_impl->f_ref, env);
+ axis2_qname_free(interface_fault_ref_impl->f_ref, env);
}
- interface_fault_ref_impl->f_ref = AXIS2_QNAME_CLONE(fault_qname, env);
+ interface_fault_ref_impl->f_ref = axis2_qname_clone(fault_qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_interface_msg_ref.c Sat Mar 17 00:48:05 2007
@@ -697,7 +697,7 @@
if (interface_msg_ref_impl->f_element_qname)
{
- AXIS2_QNAME_FREE(interface_msg_ref_impl->f_element_qname, env);
+ axis2_qname_free(interface_msg_ref_impl->f_element_qname, env);
interface_msg_ref_impl->f_element_qname = NULL;
}
@@ -1004,7 +1004,7 @@
{
AXIS2_FREE(env->allocator, interface_msg_ref_impl->f_msg_content_model);
}
- interface_msg_ref_impl->f_msg_content_model = AXIS2_STRDUP(nm_token, env);
+ interface_msg_ref_impl->f_msg_content_model = axis2_strdup(nm_token, env);
return AXIS2_SUCCESS;
}
@@ -1025,9 +1025,9 @@
if (interface_msg_ref_impl->f_element_qname)
{
- AXIS2_QNAME_FREE(interface_msg_ref_impl->f_element_qname, env);
+ axis2_qname_free(interface_msg_ref_impl->f_element_qname, env);
}
- interface_msg_ref_impl->f_element_qname = AXIS2_QNAME_CLONE(element, env);
+ interface_msg_ref_impl->f_element_qname = axis2_qname_clone(element, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c Sat Mar 17 00:48:05 2007
@@ -609,13 +609,13 @@
if (svc_impl->f_qname)
{
- AXIS2_QNAME_FREE(svc_impl->f_qname, env);
+ axis2_qname_free(svc_impl->f_qname, env);
svc_impl->f_qname = NULL;
}
if (svc_impl->f_interface_qname)
{
- AXIS2_QNAME_FREE(svc_impl->f_interface_qname, env);
+ axis2_qname_free(svc_impl->f_interface_qname, env);
svc_impl->f_interface_qname = NULL;
}
@@ -823,9 +823,9 @@
if (svc_impl->f_qname)
{
- AXIS2_QNAME_FREE(svc_impl->f_qname, env);
+ axis2_qname_free(svc_impl->f_qname, env);
}
- svc_impl->f_qname = AXIS2_QNAME_CLONE(qname, env);
+ svc_impl->f_qname = axis2_qname_clone(qname, env);
return AXIS2_SUCCESS;
}
@@ -845,10 +845,10 @@
if (svc_impl->f_interface_qname)
{
- AXIS2_QNAME_FREE(svc_impl->f_interface_qname, env);
+ axis2_qname_free(svc_impl->f_interface_qname, env);
}
- svc_impl->f_interface_qname = AXIS2_QNAME_CLONE(interface_qname, env);
+ svc_impl->f_interface_qname = axis2_qname_clone(interface_qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c Sat Mar 17 00:48:05 2007
@@ -354,7 +354,7 @@
list_token_attr_impl = INTF_TO_IMPL(list_token_attr);
/* First, check if the attribute contains the xs:token '#any'.*/
- if (0 == AXIS2_STRCMP("#any", attr_value)) return attr_value;
+ if (0 == axis2_strcmp("#any", attr_value)) return attr_value;
/* Second, assume the attribute contains a list of xs:QName. */
if (attr_value)
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c Sat Mar 17 00:48:05 2007
@@ -362,7 +362,7 @@
token_attr_impl = INTF_TO_IMPL(token_attr);
/* First, check if the attribute contains the xs:token '#any'.*/
- if (0 == AXIS2_STRCMP("#any", attr_value)) return attr_value;
+ if (0 == axis2_strcmp("#any", attr_value)) return attr_value;
/* Second, assume the attribute contains a list of xs:QName. */
if (attr_value)
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_string_attr.c Sat Mar 17 00:48:05 2007
@@ -238,7 +238,7 @@
if (attr_value)
{
- str = AXIS2_STRDUP(attr_value, env);
+ str = axis2_strdup(attr_value, env);
if (!str)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c?view=diff&rev=519258&r1=519257&r2=519258
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_xml_attr.c Sat Mar 17 00:48:05 2007
@@ -128,7 +128,7 @@
if (xml_attr_impl->f_attr_type)
{
- AXIS2_QNAME_FREE(xml_attr_impl->f_attr_type, env);
+ axis2_qname_free(xml_attr_impl->f_attr_type, env);
xml_attr_impl->f_attr_type = NULL;
}
@@ -203,16 +203,16 @@
if (xml_attr_impl->f_attr_type)
{
- AXIS2_QNAME_FREE(xml_attr_impl->f_attr_type, env);
+ axis2_qname_free(xml_attr_impl->f_attr_type, env);
xml_attr_impl->f_attr_type = NULL;
}
- xml_attr_impl->f_attr_type = AXIS2_QNAME_CLONE(attr_type, env);
+ xml_attr_impl->f_attr_type = axis2_qname_clone(attr_type, env);
if (xml_attr_impl->f_attr_type)
{
- AXIS2_QNAME_FREE(xml_attr_impl->f_attr_type, env);
+ axis2_qname_free(xml_attr_impl->f_attr_type, env);
xml_attr_impl->f_attr_type = NULL;
}
- xml_attr_impl->f_external_form = AXIS2_STRDUP(attr_value, env);
+ xml_attr_impl->f_external_form = axis2_strdup(attr_value, env);
xml_attr_impl->f_content = xml_attr_impl->xml_attr.ops->
convert(&(xml_attr_impl->xml_attr), env, owner_el, owner_node,
attr_value);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org