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 di...@apache.org on 2007/03/06 10:15:33 UTC
svn commit: r515039 [5/5] - in /webservices/axis2/trunk/c:
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/src/util/ modules/core/addr/ modules/core/clientapi/
modules/core/context/ modules/core/deployment/ modules/...
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=515039&r1=515038&r2=515039
==============================================================================
--- 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 Tue Mar 6 01:15:20 2007
@@ -341,13 +341,13 @@
includes = WODEN_DESC_ELEMENT_GET_INCLUDE_ELEMENTS(desc, env);
if (includes)
{
- size = AXIS2_ARRAY_LIST_SIZE(includes, env);
+ size = axis2_array_list_size(includes, env);
for (i = 0; i < size; i++)
{
void *incl_desc = NULL;
void *incl_el = NULL;
- incl_el = AXIS2_ARRAY_LIST_GET(includes, env, i);
+ incl_el = axis2_array_list_get(includes, env, i);
incl_desc = WODEN_INCLUDE_ELEMENT_GET_DESC_ELEMENT(incl_el, env);
if (incl_desc)
{
@@ -359,13 +359,13 @@
imports = WODEN_DESC_ELEMENT_GET_IMPORT_ELEMENTS(desc, env);
if (imports)
{
- size = AXIS2_ARRAY_LIST_SIZE(imports, env);
+ size = axis2_array_list_size(imports, env);
for (i = 0; i < size; i++)
{
void *imp_desc = NULL;
void *imp_el = NULL;
- imp_el = AXIS2_ARRAY_LIST_GET(imports, env, i);
+ imp_el = axis2_array_list_get(imports, env, i);
imp_desc = WODEN_IMPORT_ELEMENT_GET_DESC_ELEMENT(imp_el, env);
if (imp_desc)
{
@@ -412,21 +412,21 @@
referenceable_schema_defs =
WODEN_TYPES_GET_REFERENCEABLE_SCHEMA_DEFS(types, env);
if (referenceable_schema_defs)
- size = AXIS2_ARRAY_LIST_SIZE(referenceable_schema_defs, env);
+ size = axis2_array_list_size(referenceable_schema_defs, env);
for (i = 0; i < size; i++)
{
void *schema_def = NULL;
int i = 0, size = 0;
axis2_bool_t new_schema = AXIS2_TRUE;
- schema_def = AXIS2_ARRAY_LIST_GET(referenceable_schema_defs, env, i);
+ schema_def = axis2_array_list_get(referenceable_schema_defs, env, i);
if (builder_impl->f_schemas_done)
- size = AXIS2_ARRAY_LIST_SIZE(builder_impl->f_schemas_done, env);
+ size = axis2_array_list_size(builder_impl->f_schemas_done, env);
for (i = 0; i < size; i++)
{
void *schema_done = NULL;
- schema_done = AXIS2_ARRAY_LIST_GET(builder_impl->f_schemas_done,
+ schema_done = axis2_array_list_get(builder_impl->f_schemas_done,
env, i);
/* TODO Check the logic here */
if (schema_def == schema_done)
@@ -447,7 +447,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
}
- AXIS2_ARRAY_LIST_ADD(builder_impl->f_schemas_done, env, schema_def);
+ axis2_array_list_add(builder_impl->f_schemas_done, env, schema_def);
}
}
}
@@ -482,13 +482,13 @@
element_table = XML_SCHEMA_GET_ELEMENTS(schema_def, env);
qnames = XML_SCHEMA_OBJ_TABLE_GET_NAMES(element_table, env);
if (qnames)
- size = AXIS2_ARRAY_LIST_SIZE(qnames, env);
+ size = axis2_array_list_size(qnames, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
axis2_char_t *namespc = NULL;
- qname = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(qnames, env, i);
+ 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))
@@ -539,13 +539,13 @@
type_table = XML_SCHEMA_GET_SCHEMA_TYPES(schema_def, env);
qnames = XML_SCHEMA_OBJ_TABLE_GET_NAMES(type_table, env);
if (qnames)
- size = AXIS2_ARRAY_LIST_SIZE(qnames, env);
+ size = axis2_array_list_size(qnames, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
axis2_char_t *namespc = NULL;
- qname = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(qnames, env, i);
+ 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))
@@ -595,14 +595,14 @@
interface_els = WODEN_DESC_ELEMENT_GET_INTERFACE_ELEMENTS(desc, env);
if (interface_els)
{
- size = AXIS2_ARRAY_LIST_SIZE(interface_els, env);
+ size = axis2_array_list_size(interface_els, env);
}
for (i = 0; i < size; i++)
{
void *int_impl = NULL;
- int_impl = AXIS2_ARRAY_LIST_GET(interface_els, env, i);
- if (AXIS2_TRUE != AXIS2_ARRAY_LIST_CONTAINS(interface_els, env, int_impl))
+ int_impl = axis2_array_list_get(interface_els, env, i);
+ if (AXIS2_TRUE != axis2_array_list_contains(interface_els, env, int_impl))
{
axis2_array_list_t *property_els = NULL;
void *configurable = NULL;
@@ -624,7 +624,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
}
- AXIS2_ARRAY_LIST_ADD(builder_impl->f_interfaces_done, env, int_impl);
+ axis2_array_list_add(builder_impl->f_interfaces_done, env, int_impl);
}
}
return AXIS2_SUCCESS;
@@ -648,14 +648,14 @@
faults = WODEN_INTERFACE_ELEMENT_GET_INTERFACE_FAULT_ELEMENTS(
interface, env);
if (faults)
- size = AXIS2_ARRAY_LIST_SIZE(faults, env);
+ size = axis2_array_list_size(faults, env);
for (i = 0; i < size; i++)
{
void *fault = NULL;
axis2_array_list_t *property_elements = NULL;
axis2_qname_t *qname = NULL;
- fault = AXIS2_ARRAY_LIST_GET(faults, env, i);
+ fault = axis2_array_list_get(faults, env, i);
fault = woden_interface_fault_to_configurable_element(fault, env);
property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
fault, env);
@@ -692,13 +692,13 @@
ops = WODEN_INTERFACE_ELEMENT_GET_INTERFACE_OP_ELEMENTS(
interface, env);
if (ops)
- size = AXIS2_ARRAY_LIST_SIZE(ops, env);
+ size = axis2_array_list_size(ops, env);
for (i = 0; i < size; i++)
{
void *op = NULL;
axis2_array_list_t *property_elements = NULL;
- op = AXIS2_ARRAY_LIST_GET(ops, env, i);
+ op = axis2_array_list_get(ops, env, i);
op = woden_interface_op_to_configurable_element(op, env);
property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
op, env);
@@ -727,14 +727,14 @@
fault_refs = WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_FAULT_REF_ELEMENTS(
op, env);
if (fault_refs)
- size = AXIS2_ARRAY_LIST_SIZE(fault_refs, env);
+ size = axis2_array_list_size(fault_refs, env);
for (i = 0; i < size; i++)
{
void *fault_ref = NULL;
axis2_array_list_t *property_elements = NULL;
axis2_qname_t *qname = NULL;
- fault_ref = AXIS2_ARRAY_LIST_GET(fault_refs, env, i);
+ fault_ref = axis2_array_list_get(fault_refs, env, i);
fault_ref = woden_interface_fault_ref_to_configurable_element(fault_ref, env);
property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
fault_ref, env);
@@ -774,14 +774,14 @@
msgs = WODEN_INTERFACE_OP_ELEMENT_GET_INTERFACE_MSG_REF_ELEMENTS(
op, env);
if (msgs)
- size = AXIS2_ARRAY_LIST_SIZE(msgs, env);
+ size = axis2_array_list_size(msgs, env);
for (i = 0; i < size; i++)
{
void *msg = NULL;
axis2_array_list_t *property_elements = NULL;
axis2_char_t *msg_content_model = NULL;
- msg = AXIS2_ARRAY_LIST_GET(msgs, env, i);
+ msg = axis2_array_list_get(msgs, env, i);
msg = woden_interface_msg_ref_to_configurable_element(msg, env);
property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
msg, env);
@@ -830,14 +830,14 @@
desc = woden_desc_to_desc_element(desc, env);
binding_els = WODEN_DESC_ELEMENT_GET_BINDING_ELEMENTS(desc, env);
if (binding_els)
- size = AXIS2_ARRAY_LIST_SIZE(binding_els, env);
+ size = axis2_array_list_size(binding_els, env);
for (i = 0; i < size; i++)
{
void *bind_impl = NULL;
- bind_impl = AXIS2_ARRAY_LIST_GET(binding_els, env, i);
+ bind_impl = axis2_array_list_get(binding_els, env, i);
if (builder_impl->f_bindings_done && AXIS2_TRUE !=
- AXIS2_ARRAY_LIST_CONTAINS(builder_impl->f_bindings_done,
+ axis2_array_list_contains(builder_impl->f_bindings_done,
env, bind_impl))
{
axis2_array_list_t *property_elements = NULL;
@@ -858,7 +858,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
}
- AXIS2_ARRAY_LIST_ADD(builder_impl->f_bindings_done, env, bind_impl);
+ axis2_array_list_add(builder_impl->f_bindings_done, env, bind_impl);
}
}
@@ -883,13 +883,13 @@
faults = WODEN_BINDING_ELEMENT_GET_BINDING_FAULT_ELEMENTS(
binding, env);
if (faults)
- size = AXIS2_ARRAY_LIST_SIZE(faults, env);
+ size = axis2_array_list_size(faults, env);
for (i = 0; i < size; i++)
{
void *fault = NULL;
axis2_array_list_t *property_elements = NULL;
- fault = AXIS2_ARRAY_LIST_GET(faults, env, i);
+ fault = axis2_array_list_get(faults, env, i);
fault = woden_binding_fault_to_configurable_element(fault, env);
property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
fault, env);
@@ -917,13 +917,13 @@
ops = WODEN_BINDING_ELEMENT_GET_BINDING_OP_ELEMENTS(
binding, env);
if (ops)
- size = AXIS2_ARRAY_LIST_SIZE(ops, env);
+ size = axis2_array_list_size(ops, env);
for (i = 0; i < size; i++)
{
void *op = NULL;
axis2_array_list_t *property_elements = NULL;
- op = AXIS2_ARRAY_LIST_GET(ops, env, i);
+ op = axis2_array_list_get(ops, env, i);
op = woden_binding_op_to_configurable_element(op, env);
property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
op, env);
@@ -954,13 +954,13 @@
fault_refs = WODEN_BINDING_OP_ELEMENT_GET_BINDING_FAULT_REF_ELEMENTS(
op, env);
if (fault_refs)
- size = AXIS2_ARRAY_LIST_SIZE(fault_refs, env);
+ size = axis2_array_list_size(fault_refs, env);
for (i = 0; i < size; i++)
{
void *fault_ref = NULL;
axis2_array_list_t *property_elements = NULL;
- fault_ref = AXIS2_ARRAY_LIST_GET(fault_refs, env, i);
+ fault_ref = axis2_array_list_get(fault_refs, env, i);
fault_ref = woden_binding_fault_ref_to_configurable_element(fault_ref, env);
property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
fault_ref, env);
@@ -988,13 +988,13 @@
msgs = WODEN_BINDING_OP_ELEMENT_GET_BINDING_MSG_REF_ELEMENTS(
op, env);
if (msgs)
- size = AXIS2_ARRAY_LIST_SIZE(msgs, env);
+ size = axis2_array_list_size(msgs, env);
for (i = 0; i < size; i++)
{
void *msg = NULL;
axis2_array_list_t *property_elements = NULL;
- msg = AXIS2_ARRAY_LIST_GET(msgs, env, i);
+ msg = axis2_array_list_get(msgs, env, i);
msg = woden_binding_msg_ref_to_configurable_element(msg, env);
property_elements = WODEN_CONFIGURABLE_ELEMENT_GET_PROPERTY_ELEMENTS(
msg, env);
@@ -1030,7 +1030,7 @@
* First, create a Component Extensions object for each registered extension namespace
* used with this binding.
*/
- size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
+ size = axis2_array_list_size(ext_namespcs, env);
for (i = 0; i < size; i++)
{
axis2_uri_t *ext_ns = NULL;
@@ -1041,7 +1041,7 @@
void *wsdl_obj = NULL;
void *wsdl_el = NULL;
- ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
+ ext_ns = axis2_array_list_get(ext_namespcs, env, i);
configurable = WODEN_BINDING_GET_BASE_IMPL(binding, env);
documentable = WODEN_CONFIGURABLE_GET_BASE_IMPL(configurable, env);
wsdl_obj = WODEN_DOCUMENTABLE_GET_BASE_IMPL(documentable, env);
@@ -1131,14 +1131,14 @@
* First, create a Component Extensions object for each registered extension namespace
* used with this binding fault.
*/
- size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
+ size = axis2_array_list_size(ext_namespcs, env);
for (i = 0; i < size; i++)
{
axis2_uri_t *ext_ns = NULL;
axis2_bool_t temp1 = AXIS2_FALSE;
axis2_bool_t temp2 = AXIS2_FALSE;
- ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
+ ext_ns = axis2_array_list_get(ext_namespcs, env, i);
bind_fault = woden_binding_fault_to_attr_extensible(
bind_fault, env);
temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1217,7 +1217,7 @@
er = WODEN_DESC_ELEMENT_GET_EXT_REGISTRY(builder_impl->f_desc, env);
ext_namespcs = WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_op");
if (ext_namespcs)
- size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
+ size = axis2_array_list_size(ext_namespcs, env);
/*
* First, create a Component Extensions object for each registered extension
* namespace used with this binding operation.
@@ -1228,7 +1228,7 @@
axis2_bool_t temp1 = AXIS2_FALSE;
axis2_bool_t temp2 = AXIS2_FALSE;
- ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
+ ext_ns = axis2_array_list_get(ext_namespcs, env, i);
bind_op = woden_binding_op_to_attr_extensible(
bind_op, env);
temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1308,14 +1308,14 @@
er = WODEN_DESC_ELEMENT_GET_EXT_REGISTRY(builder_impl->f_desc, env);
ext_namespcs = WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_msg_ref");
if (ext_namespcs)
- size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
+ size = axis2_array_list_size(ext_namespcs, env);
for (i = 0; i < size; i++)
{
axis2_uri_t *ext_ns = NULL;
axis2_bool_t temp1 = AXIS2_FALSE;
axis2_bool_t temp2 = AXIS2_FALSE;
- ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
+ ext_ns = axis2_array_list_get(ext_namespcs, env, i);
bind_msg_ref = woden_binding_msg_ref_to_attr_extensible(
bind_msg_ref, env);
temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1357,14 +1357,14 @@
er = WODEN_DESC_ELEMENT_GET_EXT_REGISTRY(builder_impl->f_desc, env);
ext_namespcs = WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_fault_ref");
if (ext_namespcs)
- size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
+ size = axis2_array_list_size(ext_namespcs, env);
for (i = 0; i < size; i++)
{
axis2_uri_t *ext_ns = NULL;
axis2_bool_t temp1 = AXIS2_FALSE;
axis2_bool_t temp2 = AXIS2_FALSE;
- ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
+ ext_ns = axis2_array_list_get(ext_namespcs, env, i);
bind_fault_ref = woden_binding_fault_ref_to_attr_extensible(
bind_fault_ref, env);
temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
@@ -1439,14 +1439,14 @@
desc = woden_desc_to_desc_element(desc, env);
svcs = WODEN_DESC_ELEMENT_GET_SVC_ELEMENTS(desc, env);
if (svcs)
- size = AXIS2_ARRAY_LIST_SIZE(svcs, env);
+ size = axis2_array_list_size(svcs, env);
for (i = 0; i < size; i++)
{
void *svc = NULL;
- svc = AXIS2_ARRAY_LIST_GET(svcs, env, i);
+ svc = axis2_array_list_get(svcs, env, i);
if (builder_impl->f_svcs_done &&
- (AXIS2_TRUE != AXIS2_ARRAY_LIST_CONTAINS(builder_impl->f_svcs_done,
+ (AXIS2_TRUE != axis2_array_list_contains(builder_impl->f_svcs_done,
env, svc)))
{
WODEN_DESC_ADD_TO_ALL_SVCS(builder_impl->f_desc, env, svc);
@@ -1460,7 +1460,7 @@
return AXIS2_FAILURE;
}
}
- AXIS2_ARRAY_LIST_ADD(builder_impl->f_svcs_done, env, svc);
+ axis2_array_list_add(builder_impl->f_svcs_done, env, svc);
}
}
return AXIS2_SUCCESS;
@@ -1486,13 +1486,13 @@
AXIS2_PARAM_CHECK(env->error, parent, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(builder);
- size = AXIS2_ARRAY_LIST_SIZE(prop_els, env);
+ size = axis2_array_list_size(prop_els, env);
for (i = 0; i < size; i++)
{
void *prop = NULL;
axis2_qname_t *qname = NULL;
- prop = AXIS2_ARRAY_LIST_GET(prop_els, env, i);
+ prop = axis2_array_list_get(prop_els, env, i);
prop = woden_property_to_property_element(prop, env);
qname = WODEN_PROPERTY_ELEMENT_GET_CONSTRAINT_QNAME(prop, env);
if (qname)
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=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c Tue Mar 6 01:15:20 2007
@@ -1282,11 +1282,11 @@
if (AXIS2_TRUE != desc_impl->f_component_initialized)
woden_desc_init_components(desc, env);
- size = AXIS2_ARRAY_LIST_SIZE(desc_impl->f_all_element_decls, env);
+ size = axis2_array_list_size(desc_impl->f_all_element_decls, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname_l = NULL;
- void *ed = AXIS2_ARRAY_LIST_GET(desc_impl->f_all_element_decls, env, i);
+ 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))
{
@@ -1334,11 +1334,11 @@
if (AXIS2_TRUE != desc_impl->f_component_initialized)
woden_desc_init_components(desc, env);
- size = AXIS2_ARRAY_LIST_SIZE(desc_impl->f_all_element_decls, env);
+ size = axis2_array_list_size(desc_impl->f_all_element_decls, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname_l = NULL;
- void *ed = AXIS2_ARRAY_LIST_GET(desc_impl->f_all_element_decls, env, i);
+ 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))
{
@@ -1545,7 +1545,7 @@
desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_import_elements, env, import_el);
+ return axis2_array_list_add(desc_impl->f_import_elements, env, import_el);
}
axis2_array_list_t *AXIS2_CALL
@@ -1579,7 +1579,7 @@
desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_include_elements, env, include_el);
+ return axis2_array_list_add(desc_impl->f_include_elements, env, include_el);
}
axis2_array_list_t *AXIS2_CALL
@@ -1652,7 +1652,7 @@
desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_interface_elements, env, intface);
+ return axis2_array_list_add(desc_impl->f_interface_elements, env, intface);
}
axis2_array_list_t *AXIS2_CALL
@@ -1686,7 +1686,7 @@
desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_binding_elements, env, binding);
+ return axis2_array_list_add(desc_impl->f_binding_elements, env, binding);
}
axis2_array_list_t *AXIS2_CALL
@@ -1720,7 +1720,7 @@
desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_svc_elements, env, svc_el);
+ return axis2_array_list_add(desc_impl->f_svc_elements, env, svc_el);
}
axis2_array_list_t *AXIS2_CALL
@@ -1970,7 +1970,7 @@
desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_interfaces, env, interface);
+ return axis2_array_list_add(desc_impl->f_all_interfaces, env, interface);
}
axis2_status_t AXIS2_CALL
@@ -1988,7 +1988,7 @@
desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_bindings, env, binding);
+ return axis2_array_list_add(desc_impl->f_all_bindings, env, binding);
}
axis2_status_t AXIS2_CALL
@@ -2006,7 +2006,7 @@
desc_impl = INTF_TO_IMPL(axis2_hash_get(super,
"WODEN_DESC", AXIS2_HASH_KEY_STRING));
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_svcs, env, svc);
+ return axis2_array_list_add(desc_impl->f_all_svcs, env, svc);
}
axis2_status_t AXIS2_CALL
@@ -2033,7 +2033,7 @@
return AXIS2_FAILURE;
}
}
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_element_decls, env, element_decl);
+ return axis2_array_list_add(desc_impl->f_all_element_decls, env, element_decl);
}
axis2_status_t AXIS2_CALL
@@ -2061,7 +2061,7 @@
}
}
- return AXIS2_ARRAY_LIST_ADD(desc_impl->f_all_type_defs, env, type_def);
+ return axis2_array_list_add(desc_impl->f_all_type_defs, env, type_def);
}
static axis2_status_t AXIS2_CALL
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=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c Tue Mar 6 01:15:20 2007
@@ -627,7 +627,7 @@
if (svc_impl->f_endpoints)
{
- AXIS2_ARRAY_LIST_FREE(svc_impl->f_endpoints, env);
+ axis2_array_list_free(svc_impl->f_endpoints, env);
svc_impl->f_endpoints = NULL;
}
@@ -908,7 +908,7 @@
}
}
- return AXIS2_ARRAY_LIST_ADD(svc_impl->f_endpoints, env, endpoint);
+ return axis2_array_list_add(svc_impl->f_endpoints, env, endpoint);
}
axis2_array_list_t *AXIS2_CALL
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c Tue Mar 6 01:15:20 2007
@@ -206,7 +206,7 @@
if (annotated_impl->unhandled_attrs)
{
/* TODO need to iterate and free attributes */
- AXIS2_ARRAY_LIST_FREE(annotated_impl->unhandled_attrs, env);
+ axis2_array_list_free(annotated_impl->unhandled_attrs, env);
annotated_impl->unhandled_attrs = NULL;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c Tue Mar 6 01:15:20 2007
@@ -423,7 +423,7 @@
builder_impl = AXIS2_INTF_TO_IMPL(builder);
- AXIS2_ARRAY_LIST_ADD(builder_impl->document_list, env, om_doc);
+ axis2_array_list_add(builder_impl->document_list, env, om_doc);
root_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(om_doc, env);
@@ -516,7 +516,7 @@
XML_SCHEMA_COLLECTION_GET_SCHEMAS(builder_impl->collection, env);
if (schemas)
{
- AXIS2_ARRAY_LIST_ADD(schemas, env, builder_impl->schema);
+ axis2_array_list_add(schemas, env, builder_impl->schema);
}
@@ -1175,9 +1175,9 @@
temp_list = axis2_tokenize(env, attribute_value, ':');
- if (temp_list && AXIS2_ARRAY_LIST_SIZE(temp_list, env) >= 1)
+ if (temp_list && axis2_array_list_size(temp_list, env) >= 1)
{
- namesp = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(temp_list, env, 0);
+ namesp = (axis2_char_t *)axis2_array_list_get(temp_list, env, 0);
}
ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
@@ -1185,7 +1185,7 @@
last_list = axis2_last_token(env, attribute_value, ':');
- name = AXIS2_ARRAY_LIST_GET(last_list, env, ':');
+ name = axis2_array_list_get(last_list, env, ':');
qn = axis2_qname_create(env, name, namesp, NULL);
@@ -1263,10 +1263,10 @@
namespaces_form_ele = axis2_tokenize(env, attr_value, ':');
ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- if (AXIS2_ARRAY_LIST_SIZE(namespaces_form_ele, env) > 1)
+ if (axis2_array_list_size(namespaces_form_ele, env) > 1)
{
axis2_char_t *result = NULL;
- key = AXIS2_ARRAY_LIST_GET(namespaces_form_ele, env, 0);
+ key = axis2_array_list_get(namespaces_form_ele, env, 0);
result = axis2_hash_get(ht_ns, key, AXIS2_HASH_KEY_STRING);
if (NULL == result)
{
@@ -1282,7 +1282,7 @@
last_list = axis2_last_token(env, attr_value, ':');
- name = AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ name = axis2_array_list_get(last_list, env, 1);
item_type_qn = axis2_qname_create(env, name, ns, NULL);
@@ -1342,7 +1342,7 @@
tokens = axis2_tokenize(env, attr_value, ' ');
v = axis2_array_list_create(env, 10);
- for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(v, env); i++)
+ for (i = 0; i < axis2_array_list_size(v, env); i++)
{
axis2_char_t *localname = NULL;
axis2_char_t *prefix = NULL;
@@ -1351,7 +1351,7 @@
axis2_char_t *mem_dup = NULL;
axis2_char_t *index = NULL;
axis2_qname_t *qn = NULL;
- member = AXIS2_ARRAY_LIST_GET(v, env, i);
+ member = axis2_array_list_get(v, env, i);
mem_dup = AXIS2_STRDUP(member, env);
index = strchr(mem_dup, ':');
@@ -1371,7 +1371,7 @@
AXIS2_FREE(env->allocator, mem_dup);
AXIS2_FFRE(env->allocator, localname);
*/
- AXIS2_ARRAY_LIST_ADD(v, env, qn);
+ axis2_array_list_add(v, env, qn);
}
XML_SCHEMA_SIMPLE_TYPE_UNION_SET_MEMBER_TYPES_QNAMES(sch_union, env, v);
}
@@ -1774,7 +1774,7 @@
if (strchr(attr_value, ':'))
{
list = axis2_tokenize(env, attr_value, ':');
- ns_from_ele = AXIS2_ARRAY_LIST_GET(list, env, 0);
+ ns_from_ele = axis2_array_list_get(list, env, 0);
}
namespaces = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
@@ -1788,8 +1788,8 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- if (last_list && AXIS2_ARRAY_LIST_SIZE(last_list, env) >= 2)
- name = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ if (last_list && axis2_array_list_size(last_list, env) >= 2)
+ name = (axis2_char_t *)axis2_array_list_get(last_list, env, 1);
qn = axis2_qname_create(env, name, result, NULL);
@@ -1914,7 +1914,7 @@
if (strchr(attr_value, ':'))
{
list = axis2_tokenize(env, attr_value, ':');
- ns_from_ele = AXIS2_ARRAY_LIST_GET(list, env, 0);
+ ns_from_ele = axis2_array_list_get(list, env, 0);
}
@@ -1929,8 +1929,8 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- if (last_list && AXIS2_ARRAY_LIST_SIZE(last_list, env) >= 2)
- name = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ if (last_list && axis2_array_list_size(last_list, env) >= 2)
+ name = (axis2_char_t *)axis2_array_list_get(last_list, env, 1);
qn = axis2_qname_create(env, name, result, NULL);
@@ -2016,7 +2016,7 @@
if (strchr(attr_value, ':'))
{
list = axis2_tokenize(env, attr_value, ':');
- prefix = AXIS2_ARRAY_LIST_GET(list, env, 0);
+ prefix = axis2_array_list_get(list, env, 0);
}
namespaces = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
@@ -2030,8 +2030,8 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- if (last_list && AXIS2_ARRAY_LIST_SIZE(last_list, env) >= 2)
- name = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ if (last_list && axis2_array_list_size(last_list, env) >= 2)
+ name = (axis2_char_t *)axis2_array_list_get(last_list, env, 1);
qn = axis2_qname_create(env, name, result, NULL);
@@ -2134,7 +2134,7 @@
if (strchr(attr_value, ':'))
{
list = axis2_tokenize(env, attr_value, ':');
- ns_from_ele = AXIS2_ARRAY_LIST_GET(list, env, 0);
+ ns_from_ele = axis2_array_list_get(list, env, 0);
}
@@ -2149,8 +2149,8 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- if (last_list && AXIS2_ARRAY_LIST_SIZE(last_list, env) >= 2)
- name = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ if (last_list && axis2_array_list_size(last_list, env) >= 2)
+ name = (axis2_char_t *)axis2_array_list_get(last_list, env, 1);
qn = axis2_qname_create(env, name, result, NULL);
@@ -2250,9 +2250,9 @@
axis2_qname_t *ref_qname = NULL;
parts = axis2_tokenize(env, attr_value, ':');
- if (parts && AXIS2_ARRAY_LIST_SIZE(parts, env) > 1)
+ if (parts && axis2_array_list_size(parts, env) > 1)
{
- prefix = AXIS2_ARRAY_LIST_GET(parts, env, 0);
+ prefix = axis2_array_list_get(parts, env, 0);
ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(
AXIS2_INTF_TO_IMPL(builder)->schema, env);
@@ -2265,7 +2265,7 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- ref = AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ ref = axis2_array_list_get(last_list, env, 1);
/** check this */
ref_qname = axis2_qname_create(env, ref, uri, NULL);
XML_SCHEMA_ATTRIBUTE_GROUP_REF_SET_REF_QNAME(attr_grp_ref, env, ref_qname);
@@ -2799,8 +2799,8 @@
AXIS2_INTF_TO_IMPL(builder)->schema, env);
- if (AXIS2_ARRAY_LIST_SIZE(parts, env) > 1)
- prefix = (axis2_char_t*)AXIS2_ARRAY_LIST_GET(parts, env, 1);
+ if (axis2_array_list_size(parts, env) > 1)
+ prefix = (axis2_char_t*)axis2_array_list_get(parts, env, 1);
result = axis2_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
if (NULL == result)
@@ -2809,7 +2809,7 @@
return NULL;
}
last_list = axis2_last_token(env, attr_value, ':');
- ref = AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ ref = axis2_array_list_get(last_list, env, 1);
ref_qname = axis2_qname_create(env, ref, XML_SCHEMA_NS, NULL);
return group;
}
@@ -2897,12 +2897,12 @@
args = axis2_tokenize(env, attr_value, ':');
- if (AXIS2_ARRAY_LIST_SIZE(args, env) > 1)
+ if (axis2_array_list_size(args, env) > 1)
{
axis2_hash_t *ht_ns = NULL;
axiom_namespace_t *ns = NULL;
ht_ns = AXIOM_ELEMENT_GET_NAMESPACES(attr_ele, env);
- prefix = AXIS2_ARRAY_LIST_GET(args, env, 0);
+ prefix = axis2_array_list_get(args, env, 0);
if (ht_ns)
{
ns = axis2_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
@@ -2929,7 +2929,7 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- name = AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ name = axis2_array_list_get(last_list, env, 1);
qn = axis2_qname_create(env, name, namesp, NULL);
XML_SCHEMA_ATTRIBUTE_SET_SCHEMA_TYPE_NAME(attr, env, qn);
@@ -2990,14 +2990,14 @@
axis2_qname_t *ref_name = NULL;
ns_list = axis2_tokenize(env, attr_value, ':');
- if (AXIS2_ARRAY_LIST_SIZE(ns_list, env) > 1)
+ if (axis2_array_list_size(ns_list, env) > 1)
{
axis2_char_t *result = NULL;
axis2_hash_t *ns_hash = NULL;
axis2_char_t *prefix = NULL;
axis2_char_t *xml_prefix = NULL;
- prefix = AXIS2_ARRAY_LIST_GET(ns_list, env, 1);
- xml_prefix = AXIS2_ARRAY_LIST_GET(ns_list, env, 1);
+ prefix = axis2_array_list_get(ns_list, env, 1);
+ xml_prefix = axis2_array_list_get(ns_list, env, 1);
ns_hash = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
@@ -3017,7 +3017,7 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- name = AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ name = axis2_array_list_get(last_list, env, 1);
ref_name = axis2_qname_create(env, name, namesp, NULL);
XML_SCHEMA_ATTRIBUTE_SET_REF_NAME(attr, env, ref_name);
@@ -3207,12 +3207,12 @@
args = axis2_tokenize(env, attr_value, ':');
- if (AXIS2_ARRAY_LIST_SIZE(args, env) > 1)
+ if (axis2_array_list_size(args, env) > 1)
{
axis2_hash_t *ht_ns = NULL;
axiom_namespace_t *ns = NULL;
ht_ns = AXIOM_ELEMENT_GET_NAMESPACES(om_ele, env);
- prefix = AXIS2_ARRAY_LIST_GET(args, env, 0);
+ prefix = axis2_array_list_get(args, env, 0);
if (ht_ns)
{
ns = axis2_hash_get(ht_ns, prefix, AXIS2_HASH_KEY_STRING);
@@ -3238,7 +3238,7 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- type_name = AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ type_name = axis2_array_list_get(last_list, env, 1);
type_qname = axis2_qname_create(env, type_name, namesp, NULL);
XML_SCHEMA_ELEMENT_SET_SCHEMA_TYPE_QNAME(sch_ele, env, type_qname);
@@ -3255,12 +3255,12 @@
XML_SCHEMA_ELEMENT_SET_SCHEMA_TYPE(sch_ele, env, type);
if (args)
{
- AXIS2_ARRAY_LIST_FREE(args, env);
+ axis2_array_list_free(args, env);
args = NULL;
}
if (last_list)
{
- AXIS2_ARRAY_LIST_FREE(last_list, env);
+ axis2_array_list_free(last_list, env);
last_list = NULL;
}
}
@@ -3277,11 +3277,11 @@
args = axis2_tokenize(env, attr_value, ':');
ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- if (AXIS2_ARRAY_LIST_SIZE(args, env) > 0)
+ if (axis2_array_list_size(args, env) > 0)
{
axis2_char_t *result = NULL;
- args0 = AXIS2_ARRAY_LIST_GET(args, env, 0);
+ args0 = axis2_array_list_get(args, env, 0);
result = axis2_hash_get(ht_ns, args0, AXIS2_HASH_KEY_STRING);
if (!result)
{
@@ -3296,7 +3296,7 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- ref_name = AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ ref_name = axis2_array_list_get(last_list, env, 1);
qn = axis2_qname_create(env, ref_name, namesp, NULL);
XML_SCHEMA_ELEMENT_SET_REF_NAME(sch_ele, env, qn);
@@ -3361,11 +3361,11 @@
args = axis2_tokenize(env, attr_val, ':');
ht_ns = XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
- if (AXIS2_ARRAY_LIST_SIZE(args, env) > 0)
+ if (axis2_array_list_size(args, env) > 0)
{
axis2_char_t *result = NULL;
- args0 = AXIS2_ARRAY_LIST_GET(args, env, 0);
+ args0 = axis2_array_list_get(args, env, 0);
result = axis2_hash_get(ht_ns, args0, AXIS2_HASH_KEY_STRING);
if (!result)
{
@@ -3380,7 +3380,7 @@
}
last_list = axis2_last_token(env, attr_val, ':');
- ref_name = AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ ref_name = axis2_array_list_get(last_list, env, 1);
qn = axis2_qname_create(env, ref_name, namesp, NULL);
XML_SCHEMA_IDENTITY_CONSTRAINT_SET_REFER(keyref, env, qn);
@@ -3557,12 +3557,12 @@
ns_from_ele = axis2_tokenize(env, attr_value, ':');
/** check this */
- if (ns_from_ele && AXIS2_ARRAY_LIST_SIZE(ns_from_ele, env) > 1)
+ if (ns_from_ele && axis2_array_list_size(ns_from_ele, env) > 1)
{
axis2_char_t *ns1 = NULL;
axis2_hash_t *namespaces_ht = NULL;
- ns1 = AXIS2_ARRAY_LIST_GET(ns_from_ele, env, 0);
+ ns1 = axis2_array_list_get(ns_from_ele, env, 0);
namespaces_ht =
XML_SCHEMA_GET_PREFIX_TO_NAMESPACE_MAP(builder_impl->schema, env);
@@ -3575,7 +3575,7 @@
}
last_list = axis2_last_token(env, attr_value, ':');
- name = AXIS2_ARRAY_LIST_GET(last_list, env, 1);
+ name = axis2_array_list_get(last_list, env, 1);
XML_SCHEMA_IDENTITY_CONSTRAINT_SET_NAME(constraint, env, name);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c Tue Mar 6 01:15:20 2007
@@ -307,18 +307,18 @@
if (collec_impl->builder_list)
{
int i = 0, count = 0;
- count = AXIS2_ARRAY_LIST_SIZE(collec_impl->builder_list, env);
+ count = axis2_array_list_size(collec_impl->builder_list, env);
for (i = 0; i < count; i++)
{
xml_schema_builder_t *builder = NULL;
- builder = AXIS2_ARRAY_LIST_GET(collec_impl->builder_list, env, i);
+ builder = axis2_array_list_get(collec_impl->builder_list, env, i);
if (builder)
{
XML_SCHEMA_BUILDER_FREE(builder, env);
builder = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(collec_impl->builder_list, env);
+ axis2_array_list_free(collec_impl->builder_list, env);
collec_impl->builder_list = NULL;
}
@@ -489,7 +489,7 @@
AXIS2_PARAM_CHECK(env->error , document, NULL);
collec_impl = AXIS2_INTF_TO_IMPL(collection);
sch_builder = xml_schema_builder_create(env, collection);
- AXIS2_ARRAY_LIST_ADD(collec_impl->builder_list, env, sch_builder);
+ axis2_array_list_add(collec_impl->builder_list, env, sch_builder);
return XML_SCHEMA_BUILDER_BUILD(sch_builder, env, document, NULL);
}
@@ -508,7 +508,7 @@
if (!sch_builder)
return NULL;
collec_impl = AXIS2_INTF_TO_IMPL(collection);
- AXIS2_ARRAY_LIST_ADD(collec_impl->builder_list, env, sch_builder);
+ axis2_array_list_add(collec_impl->builder_list, env, sch_builder);
return XML_SCHEMA_BUILDER_BUILD_WITH_ROOT_NODE(sch_builder, env, node, NULL);
}
@@ -525,7 +525,7 @@
AXIS2_PARAM_CHECK(env->error , document, NULL);
sch_collec_impl = AXIS2_INTF_TO_IMPL(collection);
sch_builder = xml_schema_builder_create(env, collection);
- AXIS2_ARRAY_LIST_ADD(sch_collec_impl->builder_list, env, sch_builder);
+ axis2_array_list_add(sch_collec_impl->builder_list, env, sch_builder);
return XML_SCHEMA_BUILDER_BUILD(sch_builder, env, document, uri);
}
@@ -546,7 +546,7 @@
if (!sch_builder)
return NULL;
- AXIS2_ARRAY_LIST_ADD(collection_impl->builder_list, env, sch_builder);
+ axis2_array_list_add(collection_impl->builder_list, env, sch_builder);
return XML_SCHEMA_BUILDER_BUILD_WITH_ROOT_NODE(sch_builder, env, node, uri);
}
@@ -633,7 +633,7 @@
}
}
- AXIS2_ARRAY_LIST_ADD(receivers, env, obj);
+ axis2_array_list_add(receivers, env, obj);
return AXIS2_SUCCESS;
}
@@ -662,10 +662,10 @@
{
int i = 0;
- for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(receivers, env); i++)
+ for (i = 0; i < axis2_array_list_size(receivers, env); i++)
{
void *obj = NULL;
- obj = AXIS2_ARRAY_LIST_GET(receivers, env, i);
+ obj = axis2_array_list_get(receivers, env, i);
if (obj)
{
XML_SCHEMA_ELEMENT_SET_SCHEMA_TYPE(obj, env, type);
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c Tue Mar 6 01:15:20 2007
@@ -119,13 +119,13 @@
return NULL;
}
- AXIS2_ARRAY_LIST_ADD(content_processing_impl->members, env,
+ axis2_array_list_add(content_processing_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_LAX, env));
- AXIS2_ARRAY_LIST_ADD(content_processing_impl->members, env,
+ axis2_array_list_add(content_processing_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_NONE, env));
- AXIS2_ARRAY_LIST_ADD(content_processing_impl->members, env,
+ axis2_array_list_add(content_processing_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_SKIP, env));
- AXIS2_ARRAY_LIST_ADD(content_processing_impl->members, env,
+ axis2_array_list_add(content_processing_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_STRICT, env));
content_processing_impl->schema_enum = xml_schema_enum_create(env, value);
@@ -168,19 +168,19 @@
{
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(content_processing_impl->members, env);
+ size = axis2_array_list_size(content_processing_impl->members, env);
for (i = 0; i < size ; i++)
{
axis2_char_t *value = NULL;
value = (axis2_char_t*)
- AXIS2_ARRAY_LIST_GET(content_processing_impl->members, env, i);
+ axis2_array_list_get(content_processing_impl->members, env, i);
if (value)
{
AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(content_processing_impl->members, env);
+ axis2_array_list_free(content_processing_impl->members, env);
content_processing_impl->members = NULL;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c Tue Mar 6 01:15:20 2007
@@ -114,15 +114,15 @@
return NULL;
}
- AXIS2_ARRAY_LIST_ADD(content_type_impl->members, env,
+ axis2_array_list_add(content_type_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_ELEMENT_ONLY, env));
- AXIS2_ARRAY_LIST_ADD(content_type_impl->members, env,
+ axis2_array_list_add(content_type_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_EMPTY, env));
- AXIS2_ARRAY_LIST_ADD(content_type_impl->members, env,
+ axis2_array_list_add(content_type_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_MIXED, env));
- AXIS2_ARRAY_LIST_ADD(content_type_impl->members, env,
+ axis2_array_list_add(content_type_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_TEXT_ONLY, env));
content_type_impl->schema_enum = xml_schema_enum_create(env, value);
@@ -167,18 +167,18 @@
{
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(content_type_impl->members, env);
+ size = axis2_array_list_size(content_type_impl->members, env);
for (i = 0; i < size ; i++)
{
axis2_char_t *value = NULL;
- value = (axis2_char_t*) AXIS2_ARRAY_LIST_GET(content_type_impl->members, env, i);
+ value = (axis2_char_t*) axis2_array_list_get(content_type_impl->members, env, i);
if (value)
{
AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(content_type_impl->members, env);
+ axis2_array_list_free(content_type_impl->members, env);
content_type_impl->members = NULL;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c Tue Mar 6 01:15:20 2007
@@ -117,28 +117,28 @@
&(derivation_method_impl->derivation_method), env);
return NULL;
}
- AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+ axis2_array_list_add(derivation_method_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_ALL, env));
- AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+ axis2_array_list_add(derivation_method_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_EMPTY, env));
- AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+ axis2_array_list_add(derivation_method_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_EXTENSION, env));
- AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+ axis2_array_list_add(derivation_method_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_LIST, env));
- AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+ axis2_array_list_add(derivation_method_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_NONE, env));
- AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+ axis2_array_list_add(derivation_method_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_RESTRICTION, env));
- AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+ axis2_array_list_add(derivation_method_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_SUBSTITUTION, env));
- AXIS2_ARRAY_LIST_ADD(derivation_method_impl->members, env,
+ axis2_array_list_add(derivation_method_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_UNION, env));
@@ -182,18 +182,18 @@
{
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(derivation_method_impl->members, env);
+ size = axis2_array_list_size(derivation_method_impl->members, env);
for (i = 0; i < size ; i++)
{
axis2_char_t *value = NULL;
- value = (axis2_char_t*) AXIS2_ARRAY_LIST_GET(derivation_method_impl->members, env, i);
+ value = (axis2_char_t*) axis2_array_list_get(derivation_method_impl->members, env, i);
if (value)
{
AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(derivation_method_impl->members, env);
+ axis2_array_list_free(derivation_method_impl->members, env);
derivation_method_impl->members = NULL;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c Tue Mar 6 01:15:20 2007
@@ -168,7 +168,7 @@
if (schema_enum_impl->values)
{
- AXIS2_ARRAY_LIST_FREE(schema_enum_impl->values, env);
+ axis2_array_list_free(schema_enum_impl->values, env);
schema_enum_impl->values = NULL;
}
@@ -342,11 +342,11 @@
AXIS2_ENV_CHECK(env, -1);
AXIS2_PARAM_CHECK(env->error, value, -1);
AXIS2_PARAM_CHECK(env->error, values, -1);
- size = AXIS2_ARRAY_LIST_SIZE(values, env);
+ size = axis2_array_list_size(values, env);
for (i = 0; i < size; i++)
{
axis2_char_t *mem_val = NULL;
- mem_val = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(values, env, i);
+ mem_val = (axis2_char_t *)axis2_array_list_get(values, env, i);
if (mem_val && AXIS2_STRCMP(mem_val, value) == 0)
{
return i;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c Tue Mar 6 01:15:20 2007
@@ -126,13 +126,13 @@
return NULL;
}
- AXIS2_ARRAY_LIST_ADD(form_impl->members, env,
+ axis2_array_list_add(form_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_FORM_QUALIFIED, env));
- AXIS2_ARRAY_LIST_ADD(form_impl->members, env,
+ axis2_array_list_add(form_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_FORM_UNQUALIFIED, env));
- AXIS2_ARRAY_LIST_ADD(form_impl->members, env,
+ axis2_array_list_add(form_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_FORM_NONE, env));
form_impl->schema_enum = xml_schema_enum_create(env, value);
@@ -182,18 +182,18 @@
{
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(form_impl->members, env);
+ size = axis2_array_list_size(form_impl->members, env);
for (i = 0; i < size ; i++)
{
axis2_char_t *value = NULL;
- value = (axis2_char_t*) AXIS2_ARRAY_LIST_GET(form_impl->members, env, i);
+ value = (axis2_char_t*) axis2_array_list_get(form_impl->members, env, i);
if (value)
{
AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(form_impl->members, env);
+ axis2_array_list_free(form_impl->members, env);
form_impl->members = NULL;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c Tue Mar 6 01:15:20 2007
@@ -153,7 +153,7 @@
if (obj_collection_impl->objs)
{
- AXIS2_ARRAY_LIST_FREE(obj_collection_impl->objs, env);
+ axis2_array_list_free(obj_collection_impl->objs, env);
obj_collection_impl->objs = NULL;
}
@@ -177,7 +177,7 @@
xml_schema_obj_collection_impl_t *obj_collection_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
- return AXIS2_ARRAY_LIST_SIZE(obj_collection_impl->objs, env);
+ return axis2_array_list_size(obj_collection_impl->objs, env);
}
xml_schema_obj_t *AXIS2_CALL
@@ -190,7 +190,7 @@
AXIS2_ENV_CHECK(env, NULL);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
- return AXIS2_ARRAY_LIST_GET(obj_collection_impl->objs, env, i);
+ return axis2_array_list_get(obj_collection_impl->objs, env, i);
}
axis2_status_t AXIS2_CALL
@@ -206,7 +206,7 @@
AXIS2_PARAM_CHECK(env->error, item, AXIS2_FAILURE);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
- AXIS2_ARRAY_LIST_SET(obj_collection_impl->objs, env, i, item);
+ axis2_array_list_set(obj_collection_impl->objs, env, i, item);
return AXIS2_SUCCESS;
}
@@ -221,7 +221,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, item, AXIS2_FAILURE);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
- return AXIS2_ARRAY_LIST_ADD(obj_collection_impl->objs, env, item);
+ return axis2_array_list_add(obj_collection_impl->objs, env, item);
}
axis2_bool_t AXIS2_CALL
@@ -236,7 +236,7 @@
AXIS2_PARAM_CHECK(env->error, item, AXIS2_FAILURE);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
- return AXIS2_ARRAY_LIST_CONTAINS(obj_collection_impl->objs, env, item);
+ return axis2_array_list_contains(obj_collection_impl->objs, env, item);
}
int AXIS2_CALL
@@ -250,7 +250,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, item, AXIS2_FAILURE);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
- return AXIS2_ARRAY_LIST_INDEX_OF(obj_collection_impl->objs, env, item);
+ return axis2_array_list_index_of(obj_collection_impl->objs, env, item);
}
void* AXIS2_CALL
@@ -263,7 +263,7 @@
void *item = NULL;
AXIS2_ENV_CHECK(env, NULL);
obj_collection_impl = AXIS2_INTF_TO_IMPL(obj_collection);
- item = AXIS2_ARRAY_LIST_REMOVE(obj_collection_impl->objs, env, index);
+ item = axis2_array_list_remove(obj_collection_impl->objs, env, index);
return item;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c Tue Mar 6 01:15:20 2007
@@ -159,13 +159,13 @@
if (obj_table_impl->names)
{
- AXIS2_ARRAY_LIST_FREE(obj_table_impl->names, env);
+ axis2_array_list_free(obj_table_impl->names, env);
obj_table_impl->names = NULL;
}
if (obj_table_impl->values)
{
- AXIS2_ARRAY_LIST_FREE(obj_table_impl->values, env);
+ axis2_array_list_free(obj_table_impl->values, env);
obj_table_impl->values = NULL;
}
@@ -235,7 +235,7 @@
if (obj_table_impl->names)
{
- AXIS2_ARRAY_LIST_FREE(obj_table_impl->names, env);
+ axis2_array_list_free(obj_table_impl->names, env);
obj_table_impl->names = NULL;
}
@@ -254,7 +254,7 @@
/*axis2_hash_this (hi, NULL, NULL, &val);*/
axis2_hash_this(hi, &val, NULL, NULL);
qname = axis2_qname_create_from_string(env, val);
- AXIS2_ARRAY_LIST_ADD(obj_table_impl->names, env, qname);
+ axis2_array_list_add(obj_table_impl->names, env, qname);
val = NULL;
}
return obj_table_impl->names;
@@ -271,7 +271,7 @@
if (obj_table_impl->values)
{
- AXIS2_ARRAY_LIST_FREE(obj_table_impl->values, env);
+ axis2_array_list_free(obj_table_impl->values, env);
obj_table_impl->values = NULL;
}
@@ -287,7 +287,7 @@
{
void *val = NULL;
axis2_hash_this(hi, NULL, NULL, &val);
- AXIS2_ARRAY_LIST_ADD(obj_table_impl->values, env, val);
+ axis2_array_list_add(obj_table_impl->values, env, val);
val = NULL;
}
return obj_table_impl->values;
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c Tue Mar 6 01:15:20 2007
@@ -108,13 +108,13 @@
use_impl->members = axis2_array_list_create(env, 0);
if (!use_impl->members)
return NULL;
- AXIS2_ARRAY_LIST_ADD(use_impl->members, env,
+ axis2_array_list_add(use_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_NONE, env));
- AXIS2_ARRAY_LIST_ADD(use_impl->members, env,
+ axis2_array_list_add(use_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_OPTIONAL, env));
- AXIS2_ARRAY_LIST_ADD(use_impl->members, env,
+ axis2_array_list_add(use_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_PROHIBITED, env));
- AXIS2_ARRAY_LIST_ADD(use_impl->members, env,
+ axis2_array_list_add(use_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_REQUIRED, env));
use_impl->schema_enum = xml_schema_enum_create(env, value);
@@ -157,18 +157,18 @@
{
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(use_impl->members, env);
+ size = axis2_array_list_size(use_impl->members, env);
for (i = 0; i < size ; i++)
{
axis2_char_t *value = NULL;
- value = (axis2_char_t*) AXIS2_ARRAY_LIST_GET(use_impl->members, env, i);
+ value = (axis2_char_t*) axis2_array_list_get(use_impl->members, env, i);
if (value)
{
AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(use_impl->members, env);
+ axis2_array_list_free(use_impl->members, env);
use_impl->members = NULL;
}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c Tue Mar 6 01:15:20 2007
@@ -108,9 +108,9 @@
xml_schema_severity_type_free(&(severity_type_impl->severity_type), env);
return NULL;
}
- AXIS2_ARRAY_LIST_ADD(severity_type_impl->members, env,
+ axis2_array_list_add(severity_type_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_ERROR, env));
- AXIS2_ARRAY_LIST_ADD(severity_type_impl->members, env,
+ axis2_array_list_add(severity_type_impl->members, env,
AXIS2_STRDUP(XML_SCHEMA_CONST_WARNING, env));
severity_type_impl->schema_enum = xml_schema_enum_create(env, value);
@@ -159,18 +159,18 @@
{
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(severity_type_impl->members, env);
+ size = axis2_array_list_size(severity_type_impl->members, env);
for (i = 0; i < size ; i++)
{
axis2_char_t *value = NULL;
- value = (axis2_char_t*) AXIS2_ARRAY_LIST_GET(severity_type_impl->members, env, i);
+ value = (axis2_char_t*) axis2_array_list_get(severity_type_impl->members, env, i);
if (value)
{
AXIS2_FREE(env->allocator, value);
value = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(severity_type_impl->members, env);
+ axis2_array_list_free(severity_type_impl->members, env);
severity_type_impl->members = NULL;
}
@@ -240,4 +240,4 @@
const axis2_env_t *env)
{
return AXIS2_INTF_TO_IMPL(severity_type)->type;
-}
\ No newline at end of file
+}
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c Tue Mar 6 01:15:20 2007
@@ -114,29 +114,29 @@
if (!tokenized_type_impl->members)
return NULL;
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("CDATA", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("IDREF", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("IDREFS", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("ENTITY", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("ENTITIES", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("NMTOKEN", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("NMTOKENS", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("NOTATION", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("ENUMERATION", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("QName", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("NCName", env));
- AXIS2_ARRAY_LIST_ADD(tokenized_type_impl->members, env,
+ axis2_array_list_add(tokenized_type_impl->members, env,
AXIS2_STRDUP("None", env));
tokenized_type_impl->schema_enum = xml_schema_enum_create(env, value);
@@ -175,7 +175,7 @@
if (tokenized_type_impl->members)
{
- AXIS2_ARRAY_LIST_FREE(tokenized_type_impl->members, env);
+ axis2_array_list_free(tokenized_type_impl->members, env);
tokenized_type_impl->members = NULL;
}
@@ -183,11 +183,11 @@
{
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(tokenized_type_impl->members, env);
+ size = axis2_array_list_size(tokenized_type_impl->members, env);
for (i = 0; i < size ; i++)
{
axis2_char_t *value = NULL;
- value = (axis2_char_t*) AXIS2_ARRAY_LIST_GET(tokenized_type_impl->members, env, i);
+ value = (axis2_char_t*) axis2_array_list_get(tokenized_type_impl->members, env, i);
if (value)
{
AXIS2_FREE(env->allocator, value);
Modified: webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c (original)
+++ webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c Tue Mar 6 01:15:20 2007
@@ -95,9 +95,9 @@
CuAssertPtrNotNull(tc, list);
- for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(list, env); i++)
+ for (i = 0; i < axis2_array_list_size(list, env); i++)
{
- ele = AXIS2_ARRAY_LIST_GET(list, env, i);
+ ele = axis2_array_list_get(list, env, i);
CuAssertPtrNotNull(tc, ele);
@@ -228,7 +228,7 @@
CuAssertPtrNotNull(tc, schemas);
- CuAssertIntEquals(tc, 2, AXIS2_ARRAY_LIST_SIZE(schemas, env));
+ CuAssertIntEquals(tc, 2, axis2_array_list_size(schemas, env));
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org