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 [1/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/...
Author: dinesh
Date: Tue Mar 6 01:15:20 2007
New Revision: 515039
URL: http://svn.apache.org/viewvc?view=rev&rev=515039
Log:
droped maros from axis2_array_list
Modified:
webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
webservices/axis2/trunk/c/axiom/src/om/om_output.c
webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
webservices/axis2/trunk/c/axiom/src/util/om_util.c
webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
webservices/axis2/trunk/c/modules/core/description/client_utils.c
webservices/axis2/trunk/c/modules/core/description/flow.c
webservices/axis2/trunk/c/modules/core/description/msg.c
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/description/svc_grp.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/engine/phase.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
webservices/axis2/trunk/c/rampart/samples/server/sec_echo/echo_skeleton.c
webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/tokens/token_reference_list.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_signature.c
webservices/axis2/trunk/c/rampart/src/secpolicy/model/signed_encrypted_elements.c
webservices/axis2/trunk/c/rampart/src/secpolicy/model/signed_encrypted_parts.c
webservices/axis2/trunk/c/rampart/src/secpolicy/model/supporting_tokens.c
webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
webservices/axis2/trunk/c/rampart/src/util/rampart_handler_util.c
webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_builder.c
webservices/axis2/trunk/c/rampart/src/util/rampart_sec_header_processor.c
webservices/axis2/trunk/c/samples/server/Calculator/calc_skeleton.c
webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c
webservices/axis2/trunk/c/samples/server/math/math_skeleton.c
webservices/axis2/trunk/c/samples/server/mtom/mtom_skeleton.c
webservices/axis2/trunk/c/samples/server/notify/notify_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/add_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/div_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/mul_skeleton.c
webservices/axis2/trunk/c/samples/server/sg_math/sub_skeleton.c
webservices/axis2/trunk/c/savan/samples/server/listener/listener_skeleton.c
webservices/axis2/trunk/c/savan/samples/server/publisher/publisher_skeleton.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
webservices/axis2/trunk/c/test/wsdl/builder/print/test_print.c
webservices/axis2/trunk/c/tools/codegen/samples/server/calculator/axis2_svc_skel_calculator.c
webservices/axis2/trunk/c/tools/codegen/samples/server/interop_test_svc/axis2_svc_skel_interop_test_port_type_doc_service.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_compiler.c
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_writer_meta_info.c
webservices/axis2/trunk/c/tools/codegen/src/schema/databinding_adb_ext.c
webservices/axis2/trunk/c/tools/codegen/src/schema/writer/schema_writer.c
webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option.c
webservices/axis2/trunk/c/tools/codegen/src/util/cmdline_option_parser.c
webservices/axis2/trunk/c/tools/codegen/src/util/config_property_loader.c
webservices/axis2/trunk/c/tools/codegen/src/util/properties.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/emitter.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_config_loader.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine_configuration.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl2code.c
webservices/axis2/trunk/c/tools/codegen/test/unit/util/w2c_conf_test.c
webservices/axis2/trunk/c/tools/tcpmon/src/session.c
webservices/axis2/trunk/c/util/include/axis2_array_list.h
webservices/axis2/trunk/c/util/src/dir_handler.c
webservices/axis2/trunk/c/util/src/param.c
webservices/axis2/trunk/c/util/src/param_container.c
webservices/axis2/trunk/c/util/src/string_util.c
webservices/axis2/trunk/c/util/test/util/test_util.c
webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_attr_extensible.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_binding.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_configurable.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_documentable.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_element_extensible.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_interface.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_interface_op.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_soap_fault_subcodes.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_wsdl_ref.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_header_block.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/soap/woden_wsdl10_soap_module.c
webservices/axis2/trunk/c/woden/src/wsdl10/extensions/woden_wsdl10_ext_registry.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_binding_op.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_component_model_builder.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_desc.c
webservices/axis2/trunk/c/woden/src/wsdl10/woden_wsdl10_svc.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_header_block.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/soap/woden_soap_module.c
webservices/axis2/trunk/c/woden/src/wsdl20/extensions/woden_ext_registry.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_binding_op.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_component_model_builder.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_desc.c
webservices/axis2/trunk/c/woden/src/wsdl20/woden_svc.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_annotated.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_processing.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_content_type.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_derivation_method.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_enum.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_form.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_collection.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_use.c
webservices/axis2/trunk/c/xml_schema/src/xml_severity_type.c
webservices/axis2/trunk/c/xml_schema/src/xml_tokenized_type.c
webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Tue Mar 6 01:15:20 2007
@@ -242,9 +242,9 @@
int temp_stream_size = 0;
axis2_byte_t *temp = NULL;
int temp_size = 0;
- for (j = 0; j < AXIS2_ARRAY_LIST_SIZE(binary_node_list, env); j++)
+ for (j = 0; j < axis2_array_list_size(binary_node_list, env); j++)
{
- axiom_text_t *text = (axiom_text_t *)AXIS2_ARRAY_LIST_GET(binary_node_list, env, j);
+ axiom_text_t *text = (axiom_text_t *)axis2_array_list_get(binary_node_list, env, j);
if (text)
{
axiom_mime_body_part_t *mime_body_part = NULL;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_output.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Tue Mar 6 01:15:20 2007
@@ -134,7 +134,7 @@
if (om_output->binary_node_list)
{
- AXIS2_ARRAY_LIST_FREE(om_output->binary_node_list, env);
+ axis2_array_list_free(om_output->binary_node_list, env);
om_output->binary_node_list = NULL;
}
@@ -312,14 +312,14 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (om_output->binary_node_list)
{
- AXIS2_ARRAY_LIST_ADD(om_output->binary_node_list, env, om_text);
+ axis2_array_list_add(om_output->binary_node_list, env, om_text);
}
else
{
om_output->binary_node_list = axis2_array_list_create(env, 5);
if (!(om_output->binary_node_list))
return AXIS2_FAILURE;
- AXIS2_ARRAY_LIST_ADD(om_output->binary_node_list, env, om_text);
+ axis2_array_list_add(om_output->binary_node_list, env, om_text);
}
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c Tue Mar 6 01:15:20 2007
@@ -1569,12 +1569,12 @@
if (!ns_list)
return AXIS2_FAILURE;
- size = AXIS2_ARRAY_LIST_SIZE(ns_list, env);
+ size = axis2_array_list_size(ns_list, env);
for (i = 0; i < size; i++)
{
uri_prefix_element_t *ele = NULL;
void *value = NULL;
- value = AXIS2_ARRAY_LIST_GET(ns_list, env, i);
+ value = axis2_array_list_get(ns_list, env, i);
if (value)
{
ele = (uri_prefix_element_t *)value;
@@ -1593,7 +1593,7 @@
}
}
}
- AXIS2_ARRAY_LIST_FREE(ns_list, env);
+ axis2_array_list_free(ns_list, env);
ns_list = NULL;
return AXIS2_SUCCESS;
}*/
@@ -1631,7 +1631,7 @@
ele = uri_prefix_element_create(env, uri , temp_prefix, prefix, key);
if (ele)
{
- AXIS2_ARRAY_LIST_ADD(current_list, env, ele);
+ axis2_array_list_add(current_list, env, ele);
axis2_hash_set(writer_impl->uri_prefix_map, ele->key,
AXIS2_HASH_KEY_STRING, ele->prefix);
}
@@ -1850,12 +1850,12 @@
int i = 0;
if (!context)
return NULL;
- size = AXIS2_ARRAY_LIST_SIZE(context, env);
+ size = axis2_array_list_size(context, env);
for (i = 0; i < size; i++)
{
uri_prefix_element_t *ele = NULL;
void *value = NULL;
- value = AXIS2_ARRAY_LIST_GET(context, env, i);
+ value = axis2_array_list_get(context, env, i);
if (value)
{
ele = (uri_prefix_element_t*)value;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap12_builder_helper.c Tue Mar 6 01:15:20 2007
@@ -103,7 +103,7 @@
if (builder_helper->detail_element_names)
{
- AXIS2_ARRAY_LIST_FREE(builder_helper->detail_element_names, env);
+ axis2_array_list_free(builder_helper->detail_element_names, env);
builder_helper->detail_element_names = NULL;
}
@@ -507,7 +507,7 @@
builder_helper->detail_element_names = axis2_array_list_create(env, 20);
}
- AXIS2_ARRAY_LIST_ADD(builder_helper->detail_element_names, env, ele_localname);
+ axis2_array_list_add(builder_helper->detail_element_names, env, ele_localname);
}
else
@@ -645,9 +645,9 @@
if (!(builder_helper->detail_element_names))
return AXIS2_FAILURE;
- for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(builder_helper->detail_element_names, env) ; i++)
+ for (i = 0; i < axis2_array_list_size(builder_helper->detail_element_names, env) ; i++)
{
- if (AXIS2_STRCMP(parent_localname, AXIS2_ARRAY_LIST_GET(builder_helper->detail_element_names, env, i)) == 0)
+ if (AXIS2_STRCMP(parent_localname, axis2_array_list_get(builder_helper->detail_element_names, env, i)) == 0)
{
local_name_exists = AXIS2_TRUE;
detail_element_level = i + 1;
@@ -655,7 +655,7 @@
}
if (local_name_exists)
{
- AXIS2_ARRAY_LIST_ADD(builder_helper->detail_element_names, env, ele_localname);
+ axis2_array_list_add(builder_helper->detail_element_names, env, ele_localname);
}
else
{
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_envelope.c Tue Mar 6 01:15:20 2007
@@ -628,9 +628,9 @@
fault_code = AXIOM_SOAP_FAULT_GET_CODE(fault, env);
if (fault_code)
{
- for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(sub_codes, env); i++)
+ for (i = 0; i < axis2_array_list_size(sub_codes, env); i++)
{
- axis2_char_t *sub_code = (axis2_char_t*) AXIS2_ARRAY_LIST_GET(sub_codes, env, i);
+ axis2_char_t *sub_code = (axis2_char_t*) axis2_array_list_get(sub_codes, env, i);
if (sub_code)
{
axiom_soap_fault_sub_code_create_with_parent_value(env, fault_code, sub_code);
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_reason.c Tue Mar 6 01:15:20 2007
@@ -121,13 +121,13 @@
{
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(fault_reason->fault_texts, env);
+ size = axis2_array_list_size(fault_reason->fault_texts, env);
for (i = 0 ; i < size; i++)
{
axiom_soap_fault_text_t *fault_text = NULL;
void *value = NULL;
- value = AXIS2_ARRAY_LIST_GET(fault_reason->fault_texts, env, i);
+ value = axis2_array_list_get(fault_reason->fault_texts, env, i);
if (value)
{
fault_text = (axiom_soap_fault_text_t *)value;
@@ -135,7 +135,7 @@
fault_text = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(fault_reason->fault_texts, env);
+ axis2_array_list_free(fault_reason->fault_texts, env);
fault_reason->fault_texts = NULL;
}
@@ -181,13 +181,13 @@
return NULL;
/** iterate the array list */
- size = AXIS2_ARRAY_LIST_SIZE(fault_reason->fault_texts, env);
+ size = axis2_array_list_size(fault_reason->fault_texts, env);
for (i = 0; i < size; i++)
{
axiom_soap_fault_text_t *fault_text = NULL;
void *value = NULL;
- value = AXIS2_ARRAY_LIST_GET(fault_reason->fault_texts, env, i);
+ value = axis2_array_list_get(fault_reason->fault_texts, env, i);
if (value)
{
axis2_char_t *fault_lang = NULL;
@@ -287,7 +287,7 @@
if (fault_reason->fault_texts)
{
void *value = NULL;
- value = AXIS2_ARRAY_LIST_GET(fault_reason->fault_texts, env, 0);
+ value = axis2_array_list_get(fault_reason->fault_texts, env, 0);
if (value)
return (axiom_soap_fault_text_t*)value;
}
@@ -309,7 +309,7 @@
fault_reason->fault_texts = axis2_array_list_create(env, 1);
if (!fault_reason->fault_texts)
return AXIS2_FAILURE;
- AXIS2_ARRAY_LIST_ADD(fault_reason->fault_texts, env, fault_text);
+ axis2_array_list_add(fault_reason->fault_texts, env, fault_text);
}
else
{
@@ -323,7 +323,7 @@
return AXIS2_FAILURE;
/** this soap_fault text already exists */
}
- AXIS2_ARRAY_LIST_ADD(fault_reason->fault_texts, env, fault_text);
+ axis2_array_list_add(fault_reason->fault_texts, env, fault_text);
}
return AXIS2_SUCCESS;
}
@@ -340,12 +340,12 @@
if (!lang || (AXIS2_STRCMP(lang, "") == 0) || !fault_reason->fault_texts)
return AXIS2_FALSE;
- size = AXIS2_ARRAY_LIST_SIZE(fault_reason->fault_texts, env);
+ size = axis2_array_list_size(fault_reason->fault_texts, env);
for (i = 0; i < size; i++)
{
axiom_soap_fault_text_t *fault_text = NULL;
void *value = NULL;
- value = AXIS2_ARRAY_LIST_GET(fault_reason->fault_texts, env, i);
+ value = axis2_array_list_get(fault_reason->fault_texts, env, i);
if (value)
{
axis2_char_t *text_lang = NULL;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header.c Tue Mar 6 01:15:20 2007
@@ -171,17 +171,17 @@
int size = 0;
void *val = NULL;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(soap_header->header_block_keys, env);
+ size = axis2_array_list_size(soap_header->header_block_keys, env);
for (i = 0; i < size; i++)
{
- val = AXIS2_ARRAY_LIST_GET(soap_header->header_block_keys, env, i);
+ val = axis2_array_list_get(soap_header->header_block_keys, env, i);
if (val)
{
AXIS2_FREE(env->allocator, (char*)val);
val = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(soap_header->header_block_keys, env);
+ axis2_array_list_free(soap_header->header_block_keys, env);
soap_header->header_block_keys = NULL;
}
AXIS2_FREE(env->allocator, soap_header);
@@ -421,7 +421,7 @@
}
if (soap_header->header_block_keys)
{
- AXIS2_ARRAY_LIST_ADD(soap_header->header_block_keys, env, key);
+ axis2_array_list_add(soap_header->header_block_keys, env, key);
}
return AXIS2_SUCCESS;
@@ -489,7 +489,7 @@
hb_namespace_uri = AXIOM_NAMESPACE_GET_URI(ns, env);
if (AXIS2_STRCMP(hb_namespace_uri, ns_uri) == 0)
{
- AXIS2_ARRAY_LIST_ADD(header_block_list, env, header_block);
+ axis2_array_list_add(header_block_list, env, header_block);
found++;
}
}
@@ -509,7 +509,7 @@
}
else
{
- AXIS2_ARRAY_LIST_FREE(header_block_list, env);
+ axis2_array_list_free(header_block_list, env);
}
return NULL;
}
Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Tue Mar 6 01:15:20 2007
@@ -524,12 +524,12 @@
AXIOM_NODE_GET_DATA_ELEMENT(child, env);
if (om_ele)
{
- size = AXIS2_ARRAY_LIST_SIZE(names, env);
+ size = axis2_array_list_size(names, env);
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
for (i = 0; i < size; i++)
{
- given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
+ given_localname = (axis2_char_t *)axis2_array_list_get(names, env, i);
if ((child_localname) && (NULL != given_localname) &&
AXIS2_STRCMP(child_localname, given_localname) == 0)
@@ -555,11 +555,11 @@
om_ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
if (om_ele)
{
- size = AXIS2_ARRAY_LIST_SIZE(names, env);
+ size = axis2_array_list_size(names, env);
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
for (i = 0; i < size; i++)
{
- given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
+ given_localname = (axis2_char_t *)axis2_array_list_get(names, env, i);
if ((child_localname) && (NULL != given_localname) &&
(AXIS2_STRCMP(child_localname, given_localname) == 0))
{
@@ -608,10 +608,10 @@
AXIOM_NODE_GET_DATA_ELEMENT(ele_node, env);
if (om_ele)
{
- size = AXIS2_ARRAY_LIST_SIZE(names, env);
+ size = axis2_array_list_size(names, env);
for (i = 0; i < size; i++)
{
- given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
+ given_localname = (axis2_char_t *)axis2_array_list_get(names, env, i);
child_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
if (child_localname && (NULL != given_localname) &&
(AXIS2_STRCMP(child_localname, given_localname) == 0))
@@ -658,10 +658,10 @@
AXIOM_NODE_GET_DATA_ELEMENT(next_sibling, env);
if (om_ele)
{
- size = AXIS2_ARRAY_LIST_SIZE(names, env);
+ size = axis2_array_list_size(names, env);
for (i = 0; i < size; i++)
{
- given_localname = (axis2_char_t *)AXIS2_ARRAY_LIST_GET(names, env, i);
+ given_localname = (axis2_char_t *)axis2_array_list_get(names, env, i);
ele_localname = AXIOM_ELEMENT_GET_LOCALNAME(om_ele, env);
if ((ele_localname) && (NULL != given_localname) &&
(AXIS2_STRCMP(given_localname, ele_localname) == 0))
Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Tue Mar 6 01:15:20 2007
@@ -175,31 +175,31 @@
if (endpoint_ref->ref_param_list)
{
- AXIS2_ARRAY_LIST_FREE(endpoint_ref->ref_param_list, env);
+ axis2_array_list_free(endpoint_ref->ref_param_list, env);
endpoint_ref->ref_param_list = NULL;
}
if (endpoint_ref->metadata_list)
{
- AXIS2_ARRAY_LIST_FREE(endpoint_ref->metadata_list, env);
+ axis2_array_list_free(endpoint_ref->metadata_list, env);
endpoint_ref->metadata_list = NULL;
}
if (endpoint_ref->ref_attribute_list)
{
- AXIS2_ARRAY_LIST_FREE(endpoint_ref->ref_attribute_list, env);
+ axis2_array_list_free(endpoint_ref->ref_attribute_list, env);
endpoint_ref->ref_attribute_list = NULL;
}
if (endpoint_ref->meta_attribute_list)
{
- AXIS2_ARRAY_LIST_FREE(endpoint_ref->meta_attribute_list, env);
+ axis2_array_list_free(endpoint_ref->meta_attribute_list, env);
endpoint_ref->meta_attribute_list = NULL;
}
if (endpoint_ref->extension_list)
{
- AXIS2_ARRAY_LIST_FREE(endpoint_ref->extension_list, env);
+ axis2_array_list_free(endpoint_ref->extension_list, env);
endpoint_ref->extension_list = NULL;
}
@@ -251,7 +251,7 @@
if (endpoint_ref->ref_param_list && ref_param_node)
{
- return AXIS2_ARRAY_LIST_ADD(endpoint_ref->ref_param_list, env, ref_param_node);
+ return axis2_array_list_add(endpoint_ref->ref_param_list, env, ref_param_node);
}
return AXIS2_FAILURE;
@@ -277,7 +277,7 @@
if (endpoint_ref->metadata_list && meta_data_node)
{
- return AXIS2_ARRAY_LIST_ADD(endpoint_ref->metadata_list, env, meta_data_node);
+ return axis2_array_list_add(endpoint_ref->metadata_list, env, meta_data_node);
}
return AXIS2_FAILURE;
@@ -334,7 +334,7 @@
if (endpoint_ref->ref_attribute_list && attr)
{
- return AXIS2_ARRAY_LIST_ADD(endpoint_ref->ref_attribute_list, env, attr);
+ return axis2_array_list_add(endpoint_ref->ref_attribute_list, env, attr);
}
return AXIS2_FAILURE;
@@ -360,7 +360,7 @@
if (endpoint_ref->meta_attribute_list && attr)
{
- return AXIS2_ARRAY_LIST_ADD(endpoint_ref->meta_attribute_list, env, attr);
+ return axis2_array_list_add(endpoint_ref->meta_attribute_list, env, attr);
}
return AXIS2_FAILURE;
@@ -386,7 +386,7 @@
if (endpoint_ref->extension_list && extension_node)
{
- return AXIS2_ARRAY_LIST_ADD(endpoint_ref->extension_list, env, extension_node);
+ return axis2_array_list_add(endpoint_ref->extension_list, env, extension_node);
}
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Tue Mar 6 01:15:20 2007
@@ -278,7 +278,7 @@
if (ref_param)
{
- return AXIS2_ARRAY_LIST_ADD(msg_info_headers->ref_params, env, ref_param);
+ return axis2_array_list_add(msg_info_headers->ref_params, env, ref_param);
}
return AXIS2_SUCCESS;
@@ -315,7 +315,7 @@
if (msg_info_headers->ref_params)
{
- AXIS2_ARRAY_LIST_FREE(msg_info_headers->ref_params, env);
+ axis2_array_list_free(msg_info_headers->ref_params, env);
}
if (msg_info_headers->action)
{
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Tue Mar 6 01:15:20 2007
@@ -628,7 +628,7 @@
return AXIS2_FAILURE;
}
}
- AXIS2_ARRAY_LIST_ADD(svc_client_impl->headers, env, header);
+ axis2_array_list_add(svc_client_impl->headers, env, header);
return AXIS2_SUCCESS;
}
@@ -647,11 +647,11 @@
if (!svc_client_impl->headers)
return AXIS2_FAILURE;
- size = AXIS2_ARRAY_LIST_SIZE(svc_client_impl->headers, env);
+ size = axis2_array_list_size(svc_client_impl->headers, env);
for (i = 0; i < size; i++)
{
axiom_node_t *node = NULL;
- node = AXIS2_ARRAY_LIST_GET(svc_client_impl->headers, env, i);
+ node = axis2_array_list_get(svc_client_impl->headers, env, i);
if (node)
{
AXIOM_NODE_FREE_TREE(node, env);
@@ -1465,11 +1465,11 @@
{
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(svc_client_impl->headers, env);
+ size = axis2_array_list_size(svc_client_impl->headers, env);
for (i = 0; i < size; i++)
{
axiom_node_t *node = NULL;
- node = AXIS2_ARRAY_LIST_GET(svc_client_impl->headers, env, i);
+ node = axis2_array_list_get(svc_client_impl->headers, env, i);
if (node)
{
AXIOM_NODE_ADD_CHILD(header_node, env, node);
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Tue Mar 6 01:15:20 2007
@@ -1878,7 +1878,7 @@
if (msg_ctx->execution_chain)
{
axis2_handler_t *handler = (axis2_handler_t *)
- AXIS2_ARRAY_LIST_GET(msg_ctx->execution_chain,
+ axis2_array_list_get(msg_ctx->execution_chain,
env, index);
if (handler)
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Tue Mar 6 01:15:20 2007
@@ -316,7 +316,7 @@
}
if (file_data_impl->deployable_svcs)
{
- AXIS2_ARRAY_LIST_FREE(file_data_impl->deployable_svcs, env);
+ axis2_array_list_free(file_data_impl->deployable_svcs, env);
file_data_impl->deployable_svcs = NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Tue Mar 6 01:15:20 2007
@@ -426,7 +426,7 @@
{
return AXIS2_FAILURE;
}
- status = AXIS2_ARRAY_LIST_ADD(dep_svcs, env, svc);
+ status = axis2_array_list_add(dep_svcs, env, svc);
if (AXIS2_SUCCESS != status)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Tue Mar 6 01:15:20 2007
@@ -629,7 +629,7 @@
AXIS2_QNAME_FREE(qphase, env);
if (!phases)
{
- AXIS2_ARRAY_LIST_FREE(phase_list, env);
+ axis2_array_list_free(phase_list, env);
return NULL;
}
@@ -661,7 +661,7 @@
}
if (att_value)
{
- AXIS2_ARRAY_LIST_ADD(phase_list, env, att_value);
+ axis2_array_list_add(phase_list, env, att_value);
}
AXIS2_QNAME_FREE(qattname, env);
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Tue Mar 6 01:15:20 2007
@@ -519,16 +519,16 @@
int i = 0;
int size = 0;
- size = AXIS2_ARRAY_LIST_SIZE(dep_engine_impl->ws_to_deploy, env);
+ size = axis2_array_list_size(dep_engine_impl->ws_to_deploy, env);
for (i = 0; i < size; i++)
{
axis2_arch_file_data_t *file_data = NULL;
file_data = (axis2_arch_file_data_t *)
- AXIS2_ARRAY_LIST_GET(dep_engine_impl->ws_to_deploy, env, i);
+ axis2_array_list_get(dep_engine_impl->ws_to_deploy, env, i);
AXIS2_ARCH_FILE_DATA_FREE(file_data, env);
}
- AXIS2_ARRAY_LIST_FREE(dep_engine_impl->ws_to_deploy, env);
+ axis2_array_list_free(dep_engine_impl->ws_to_deploy, env);
dep_engine_impl->ws_to_deploy = NULL;
}
if (dep_engine_impl->ws_to_undeploy)
@@ -536,16 +536,16 @@
int i = 0;
int size = 0;
- size = AXIS2_ARRAY_LIST_SIZE(dep_engine_impl->ws_to_undeploy, env);
+ size = axis2_array_list_size(dep_engine_impl->ws_to_undeploy, env);
for (i = 0; i < size; i++)
{
axis2_arch_file_data_t *file_data = NULL;
file_data = (axis2_arch_file_data_t *)
- AXIS2_ARRAY_LIST_GET(dep_engine_impl->ws_to_undeploy, env, i);
+ axis2_array_list_get(dep_engine_impl->ws_to_undeploy, env, i);
AXIS2_ARCH_FILE_DATA_FREE(file_data, env);
}
- AXIS2_ARRAY_LIST_FREE(dep_engine_impl->ws_to_undeploy, env);
+ axis2_array_list_free(dep_engine_impl->ws_to_undeploy, env);
dep_engine_impl->ws_to_undeploy = NULL;
}
if (dep_engine_impl->module_list)
@@ -553,18 +553,18 @@
int size = 0;
int i = 0;
- size = AXIS2_ARRAY_LIST_SIZE(dep_engine_impl->module_list, env);
+ size = axis2_array_list_size(dep_engine_impl->module_list, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
- qname = AXIS2_ARRAY_LIST_GET(dep_engine_impl->module_list, env, i);
+ qname = axis2_array_list_get(dep_engine_impl->module_list, env, i);
if (qname)
{
AXIS2_QNAME_FREE(qname, env);
qname = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(dep_engine_impl->module_list, env);
+ axis2_array_list_free(dep_engine_impl->module_list, env);
dep_engine_impl->module_list = NULL;
}
if (dep_engine_impl->folder_name)
@@ -628,7 +628,7 @@
return AXIS2_FAILURE;
}
}
- return AXIS2_ARRAY_LIST_ADD(dep_engine_impl->module_list, env, qname);
+ return axis2_array_list_add(dep_engine_impl->module_list, env, qname);
}
struct axis2_module_desc *AXIS2_CALL
@@ -667,7 +667,7 @@
AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
dep_engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
- return AXIS2_ARRAY_LIST_ADD(dep_engine_impl->ws_to_deploy, env, file);
+ return axis2_array_list_add(dep_engine_impl->ws_to_deploy, env, file);
}
axis2_status_t AXIS2_CALL
@@ -684,7 +684,7 @@
{
dep_engine_impl->ws_to_undeploy = axis2_array_list_create(env, 0);
}
- return AXIS2_ARRAY_LIST_ADD(dep_engine_impl->ws_to_undeploy, env, file);
+ return axis2_array_list_add(dep_engine_impl->ws_to_undeploy, env, file);
}
axis2_phases_info_t *AXIS2_CALL
@@ -833,7 +833,7 @@
dep_engine_impl->phases_info, env);
new_out_fault_phases = axis2_phases_info_copy_flow(env, out_fault_phases);
if (out_fault_phases)
- AXIS2_ARRAY_LIST_FREE(out_fault_phases, env);
+ axis2_array_list_free(out_fault_phases, env);
AXIS2_CONF_SET_OUT_FAULT_PHASES(dep_engine_impl->conf, env, new_out_fault_phases);
if (AXIS2_SUCCESS != status)
{
@@ -1009,11 +1009,11 @@
/* there are no modules */
return AXIS2_SUCCESS;
}
- size = AXIS2_ARRAY_LIST_SIZE(dep_engine_impl->module_list, env);
+ size = axis2_array_list_size(dep_engine_impl->module_list, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
- qname = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(
+ qname = (axis2_qname_t *) axis2_array_list_get(
dep_engine_impl->module_list, env, i);
if (qname && dep_engine_impl->conf)
{
@@ -1046,10 +1046,10 @@
/* TODO condition checking should be otherway since null value can occur */
if (in_phases)
{
- phase0 = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(in_phases, env, 0);
- phase1 = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(in_phases, env, 1);
- phase2 = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(in_phases, env, 2);
- phase3 = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(in_phases, env, 3);
+ phase0 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 0);
+ phase1 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 1);
+ phase2 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 2);
+ phase3 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 3);
}
if ((phase0 && 0 != AXIS2_STRCMP(phase0, AXIS2_PHASE_TRANSPORT_IN)) ||
(phase1 && 0 != AXIS2_STRCMP(phase1, AXIS2_PHASE_PRE_DISPATCH)) ||
@@ -1081,7 +1081,7 @@
svcs = AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(dep_engine_impl->curr_file,
env);
if (svcs)
- sizei = AXIS2_ARRAY_LIST_SIZE(svcs, env);
+ sizei = axis2_array_list_size(svcs, env);
for (i = 0; i < sizei; i++)
{
@@ -1095,7 +1095,7 @@
axis2_hash_index_t *index_i = NULL;
axis2_char_t *file_name = NULL;
- svc = (axis2_svc_t *) AXIS2_ARRAY_LIST_GET(svcs, env, i);
+ svc = (axis2_svc_t *) axis2_array_list_get(svcs, env, i);
/*axis2_dep_engine_load_svc_props(dep_engine, env, svc);*/
file = AXIS2_ARCH_FILE_DATA_GET_FILE(dep_engine_impl->curr_file, env);
@@ -1105,13 +1105,13 @@
/* modules from svc group */
grp_modules = AXIS2_SVC_GRP_GET_ALL_MODULE_QNAMES(svc_metadata, env);
if (grp_modules)
- sizej = AXIS2_ARRAY_LIST_SIZE(grp_modules, env);
+ sizej = axis2_array_list_size(grp_modules, env);
for (j = 0; j < sizej; j++)
{
axis2_module_desc_t *module_desc = NULL;
axis2_qname_t *qmodulename = NULL;
- qmodulename = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(grp_modules,
+ qmodulename = (axis2_qname_t *) axis2_array_list_get(grp_modules,
env, j);
module_desc = AXIS2_CONF_GET_MODULE(dep_engine_impl->conf, env,
qmodulename);
@@ -1132,13 +1132,13 @@
/* modules from <service> */
list = AXIS2_SVC_GET_ALL_MODULE_QNAMES(svc, env);
- sizej = AXIS2_ARRAY_LIST_SIZE(list, env);
+ sizej = axis2_array_list_size(list, env);
for (j = 0; j < sizej; j++)
{
axis2_module_desc_t *module_desc = NULL;
axis2_qname_t *qmodulename = NULL;
- qmodulename = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(list,
+ qmodulename = (axis2_qname_t *) axis2_array_list_get(list,
env, j);
module_desc = AXIS2_CONF_GET_MODULE(dep_engine_impl->conf, env,
qmodulename);
@@ -1175,13 +1175,13 @@
modules = AXIS2_OP_GET_ALL_MODULE_QNAMES(op_desc, env);
if (modules)
- sizek = AXIS2_ARRAY_LIST_SIZE(modules, env);
+ sizek = axis2_array_list_size(modules, env);
for (k = 0; k < sizek; k++)
{
axis2_qname_t *module_qname = NULL;
axis2_module_desc_t *module = NULL;
- module_qname = (axis2_qname_t *) AXIS2_ARRAY_LIST_GET(modules,
+ module_qname = (axis2_qname_t *) axis2_array_list_get(modules,
env, k);
module = AXIS2_CONF_GET_MODULE(dep_engine_impl->conf, env,
module_qname);
@@ -1493,7 +1493,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
dep_engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
- size = AXIS2_ARRAY_LIST_SIZE(dep_engine_impl->ws_to_deploy, env);
+ size = axis2_array_list_size(dep_engine_impl->ws_to_deploy, env);
if (size > 0)
{
int i = 0;
@@ -1506,7 +1506,7 @@
axis2_arch_reader_t *arch_reader = NULL;
dep_engine_impl->curr_file = (axis2_arch_file_data_t *)
- AXIS2_ARRAY_LIST_GET(dep_engine_impl->ws_to_deploy, env, i);
+ axis2_array_list_get(dep_engine_impl->ws_to_deploy, env, i);
type = AXIS2_ARCH_FILE_DATA_GET_TYPE(dep_engine_impl->curr_file, env);
switch (type)
@@ -1594,7 +1594,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
dep_engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
- size = AXIS2_ARRAY_LIST_SIZE(dep_engine_impl->ws_to_undeploy, env);
+ size = axis2_array_list_size(dep_engine_impl->ws_to_undeploy, env);
if (size > 0)
{
@@ -1605,7 +1605,7 @@
axis2_ws_info_t *ws_info = NULL;
axis2_hash_t *faulty_svcs = NULL;
- ws_info = (axis2_ws_info_t *) AXIS2_ARRAY_LIST_GET(dep_engine_impl->
+ ws_info = (axis2_ws_info_t *) axis2_array_list_get(dep_engine_impl->
ws_to_undeploy, env, i);
type = AXIS2_WS_INFO_GET_TYPE(ws_info, env);
if (type == AXIS2_SVC)
@@ -1623,7 +1623,7 @@
}
}
- AXIS2_ARRAY_LIST_FREE(dep_engine_impl->ws_to_undeploy, env);
+ axis2_array_list_free(dep_engine_impl->ws_to_undeploy, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Tue Mar 6 01:15:20 2007
@@ -702,7 +702,7 @@
}
AXIS2_PARAM_SET_PARAM_TYPE(param, env, AXIS2_DOM_PARAM);
set_attrs_and_value(param, env, element, node);
- AXIS2_ARRAY_LIST_ADD(value_list, env, param);
+ axis2_array_list_add(value_list, env, param);
}
}
else
@@ -760,7 +760,7 @@
{
if (mapping_list)
{
- AXIS2_ARRAY_LIST_FREE(mapping_list, env);
+ axis2_array_list_free(mapping_list, env);
mapping_list = NULL;
}
return AXIS2_SUCCESS;
@@ -785,7 +785,7 @@
input_action_string);
if(0 != AXIS2_STRCMP("", input_action_string))
{
- AXIS2_ARRAY_LIST_ADD(mapping_list, env, input_action_string);
+ axis2_array_list_add(mapping_list, env, input_action_string);
}
else
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Zero length " \
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Tue Mar 6 01:15:20 2007
@@ -393,15 +393,15 @@
if (qopst)
AXIS2_QNAME_FREE(qopst, env);
ops = axis2_module_builder_process_ops(module_builder, env, op_itr);
- size = AXIS2_ARRAY_LIST_SIZE(ops, env);
+ size = axis2_array_list_size(ops, env);
for (i = 0; i < size; i++)
{
axis2_op_t *op_desc = NULL;
- op_desc = (axis2_op_t *) AXIS2_ARRAY_LIST_GET(ops, env, i);
+ op_desc = (axis2_op_t *) axis2_array_list_get(ops, env, i);
AXIS2_MODULE_DESC_ADD_OP(builder_impl->module_desc, env, op_desc);
}
- AXIS2_ARRAY_LIST_FREE(ops, env);
+ axis2_array_list_free(ops, env);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"axis2_module_builder_populate_module end");
return AXIS2_SUCCESS;
@@ -539,7 +539,7 @@
AXIS2_PHASES_INFO_SET_OP_PHASES(info, env, op_desc);
/* adding operation */
- AXIS2_ARRAY_LIST_ADD(ops, env, op_desc);
+ axis2_array_list_add(ops, env, op_desc);
}
return ops;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Tue Mar 6 01:15:20 2007
@@ -211,25 +211,25 @@
if (phases_info_impl->in_phases)
{
- AXIS2_ARRAY_LIST_FREE(phases_info_impl->in_phases, env);
+ axis2_array_list_free(phases_info_impl->in_phases, env);
phases_info_impl->in_phases = NULL;
}
if (phases_info_impl->out_phases)
{
- AXIS2_ARRAY_LIST_FREE(phases_info_impl->out_phases, env);
+ axis2_array_list_free(phases_info_impl->out_phases, env);
phases_info_impl->out_phases = NULL;
}
if (phases_info_impl->in_faultphases)
{
- AXIS2_ARRAY_LIST_FREE(phases_info_impl->in_faultphases, env);
+ axis2_array_list_free(phases_info_impl->in_faultphases, env);
phases_info_impl->in_faultphases = NULL;
}
if (phases_info_impl->out_faultphases)
{
- AXIS2_ARRAY_LIST_FREE(phases_info_impl->out_faultphases, env);
+ axis2_array_list_free(phases_info_impl->out_faultphases, env);
phases_info_impl->out_faultphases = NULL;
}
if (phases_info_impl->op_in_phases)
@@ -341,7 +341,7 @@
if (phases_info_impl->in_phases)
{
- AXIS2_ARRAY_LIST_FREE(phases_info_impl->in_phases, env);
+ axis2_array_list_free(phases_info_impl->in_phases, env);
phases_info_impl->in_phases = NULL;
}
@@ -363,7 +363,7 @@
phases_info_impl = AXIS2_INTF_TO_IMPL(phases_info);
if (phases_info_impl->out_phases)
{
- AXIS2_ARRAY_LIST_FREE(phases_info_impl->out_phases, env);
+ axis2_array_list_free(phases_info_impl->out_phases, env);
phases_info_impl->out_phases = NULL;
}
phases_info_impl->out_phases = out_phases;
@@ -384,7 +384,7 @@
phases_info_impl = AXIS2_INTF_TO_IMPL(phases_info);
if (phases_info_impl->in_faultphases)
{
- AXIS2_ARRAY_LIST_FREE(phases_info_impl->in_faultphases, env);
+ axis2_array_list_free(phases_info_impl->in_faultphases, env);
phases_info_impl->in_faultphases = NULL;
}
phases_info_impl->in_faultphases = in_faultphases;
@@ -405,7 +405,7 @@
phases_info_impl = AXIS2_INTF_TO_IMPL(phases_info);
if (phases_info_impl->out_faultphases)
{
- AXIS2_ARRAY_LIST_FREE(phases_info_impl->out_faultphases, env);
+ axis2_array_list_free(phases_info_impl->out_faultphases, env);
phases_info_impl->out_faultphases = NULL;
}
phases_info_impl->out_faultphases = out_faultphases;
@@ -483,12 +483,12 @@
AXIS2_PHASE_POLICY_DETERMINATION, AXIS2_HASH_KEY_STRING, phase);
}
- status = AXIS2_ARRAY_LIST_ADD(op_in_phases, env, phase);
+ status = axis2_array_list_add(op_in_phases, env, phase);
if (AXIS2_SUCCESS != status)
{
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
- AXIS2_ARRAY_LIST_FREE(op_in_phases, env);
+ axis2_array_list_free(op_in_phases, env);
op_in_phases = NULL;
return NULL;
}*/
@@ -496,10 +496,10 @@
{
return op_in_phases;
}
- size = AXIS2_ARRAY_LIST_SIZE(phases_info_impl->in_phases, env);
+ size = axis2_array_list_size(phases_info_impl->in_phases, env);
for (i = 0; i < size; i++)
{
- phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(
+ phase_name = (axis2_char_t *) axis2_array_list_get(
phases_info_impl->in_phases, env, i);
if (0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name) ||
0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name) ||
@@ -518,7 +518,7 @@
axis2_hash_set(phases_info_impl->op_in_phases, phase_name,
AXIS2_HASH_KEY_STRING, phase);
}
- status = AXIS2_ARRAY_LIST_ADD(op_in_phases, env, phase);
+ status = axis2_array_list_add(op_in_phases, env, phase);
if (AXIS2_SUCCESS != status)
{
int i = 0;
@@ -526,14 +526,14 @@
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
- size = AXIS2_ARRAY_LIST_SIZE(op_in_phases, env);
+ size = axis2_array_list_size(op_in_phases, env);
for (i = 0; i < size; i++)
{
- phase = AXIS2_ARRAY_LIST_GET(op_in_phases, env, i);
+ phase = axis2_array_list_get(op_in_phases, env, i);
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
}
- AXIS2_ARRAY_LIST_FREE(op_in_phases, env);
+ axis2_array_list_free(op_in_phases, env);
op_in_phases = NULL;
return NULL;
}
@@ -560,7 +560,7 @@
phases_info_impl = AXIS2_INTF_TO_IMPL(phases_info);
if (phases_info_impl->out_phases)
- size = AXIS2_ARRAY_LIST_SIZE(phases_info_impl->out_phases, env);
+ size = axis2_array_list_size(phases_info_impl->out_phases, env);
op_out_phases = axis2_array_list_create(env, 0);
if (!op_out_phases)
{
@@ -569,7 +569,7 @@
}
for (i = 0; i < size; i++)
{
- phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(phases_info_impl->
+ phase_name = (axis2_char_t *) axis2_array_list_get(phases_info_impl->
out_phases, env, i);
phase = axis2_hash_get(phases_info_impl->op_out_phases, phase_name,
AXIS2_HASH_KEY_STRING);
@@ -579,7 +579,7 @@
axis2_hash_set(phases_info_impl->op_out_phases, phase_name,
AXIS2_HASH_KEY_STRING, phase);
}
- status = AXIS2_ARRAY_LIST_ADD(op_out_phases, env, phase);
+ status = axis2_array_list_add(op_out_phases, env, phase);
if (AXIS2_SUCCESS != status)
{
int i = 0;
@@ -587,14 +587,14 @@
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
- size = AXIS2_ARRAY_LIST_SIZE(op_out_phases, env);
+ size = axis2_array_list_size(op_out_phases, env);
for (i = 0; i < size; i++)
{
- phase = AXIS2_ARRAY_LIST_GET(op_out_phases, env, i);
+ phase = axis2_array_list_get(op_out_phases, env, i);
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
}
- AXIS2_ARRAY_LIST_FREE(op_out_phases, env);
+ axis2_array_list_free(op_out_phases, env);
op_out_phases = NULL;
return NULL;
}
@@ -607,7 +607,7 @@
axis2_hash_set(phases_info_impl->op_out_phases,
AXIS2_PHASE_POLICY_DETERMINATION, AXIS2_HASH_KEY_STRING, phase);
}
- status = AXIS2_ARRAY_LIST_ADD(op_out_phases, env, phase);
+ status = axis2_array_list_add(op_out_phases, env, phase);
if (AXIS2_SUCCESS != status)
{
int i = 0;
@@ -615,14 +615,14 @@
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
- size = AXIS2_ARRAY_LIST_SIZE(op_out_phases, env);
+ size = axis2_array_list_size(op_out_phases, env);
for (i = 0; i < size; i++)
{
- phase = AXIS2_ARRAY_LIST_GET(op_out_phases, env, i);
+ phase = axis2_array_list_get(op_out_phases, env, i);
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
}
- AXIS2_ARRAY_LIST_FREE(op_out_phases, env);
+ axis2_array_list_free(op_out_phases, env);
op_out_phases = NULL;
return NULL;
}
@@ -637,7 +637,7 @@
if(phase)
{
- status = AXIS2_ARRAY_LIST_ADD(op_out_phases, env, phase);
+ status = axis2_array_list_add(op_out_phases, env, phase);
}
if (AXIS2_SUCCESS != status || !phase)
@@ -647,14 +647,14 @@
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
- size = AXIS2_ARRAY_LIST_SIZE(op_out_phases, env);
+ size = axis2_array_list_size(op_out_phases, env);
for (i = 0; i < size; i++)
{
- phase = AXIS2_ARRAY_LIST_GET(op_out_phases, env, i);
+ phase = axis2_array_list_get(op_out_phases, env, i);
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
}
- AXIS2_ARRAY_LIST_FREE(op_out_phases, env);
+ axis2_array_list_free(op_out_phases, env);
op_out_phases = NULL;
return NULL;
@@ -682,7 +682,7 @@
{
return NULL;
}
- size = AXIS2_ARRAY_LIST_SIZE(phases_info_impl->in_faultphases, env);
+ size = axis2_array_list_size(phases_info_impl->in_faultphases, env);
if (0 == size)
{
return NULL;
@@ -695,7 +695,7 @@
}
for (i = 0; i < size; i++)
{
- phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(phases_info_impl->
+ phase_name = (axis2_char_t *) axis2_array_list_get(phases_info_impl->
in_faultphases, env, i);
phase = axis2_hash_get(phases_info_impl->op_in_faultphases, phase_name,
AXIS2_HASH_KEY_STRING);
@@ -705,7 +705,7 @@
axis2_hash_set(phases_info_impl->op_in_faultphases,
phase_name, AXIS2_HASH_KEY_STRING, phase);
}
- status = AXIS2_ARRAY_LIST_ADD(op_in_faultphases, env, phase);
+ status = axis2_array_list_add(op_in_faultphases, env, phase);
if (AXIS2_SUCCESS != status)
{
int i = 0;
@@ -713,14 +713,14 @@
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
- size = AXIS2_ARRAY_LIST_SIZE(op_in_faultphases, env);
+ size = axis2_array_list_size(op_in_faultphases, env);
for (i = 0; i < size; i++)
{
- phase = AXIS2_ARRAY_LIST_GET(op_in_faultphases, env, i);
+ phase = axis2_array_list_get(op_in_faultphases, env, i);
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
}
- AXIS2_ARRAY_LIST_FREE(op_in_faultphases, env);
+ axis2_array_list_free(op_in_faultphases, env);
op_in_faultphases = NULL;
return NULL;
@@ -750,7 +750,7 @@
{
return NULL;
}
- size = AXIS2_ARRAY_LIST_SIZE(phases_info_impl->out_faultphases, env);
+ size = axis2_array_list_size(phases_info_impl->out_faultphases, env);
if (0 == size)
return NULL;
op_out_faultphases = axis2_array_list_create(env, 0);
@@ -761,7 +761,7 @@
}
for (i = 0; i < size; i++)
{
- phase_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(phases_info_impl->
+ phase_name = (axis2_char_t *) axis2_array_list_get(phases_info_impl->
out_faultphases, env, i);
phase = axis2_hash_get(phases_info_impl->op_out_faultphases, phase_name,
AXIS2_HASH_KEY_STRING);
@@ -771,7 +771,7 @@
axis2_hash_set(phases_info_impl->op_out_faultphases,
phase_name, AXIS2_HASH_KEY_STRING, phase);
}
- status = AXIS2_ARRAY_LIST_ADD(op_out_faultphases, env, phase);
+ status = axis2_array_list_add(op_out_faultphases, env, phase);
if (AXIS2_SUCCESS != status)
{
int i = 0;
@@ -779,14 +779,14 @@
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
- size = AXIS2_ARRAY_LIST_SIZE(op_out_faultphases, env);
+ size = axis2_array_list_size(op_out_faultphases, env);
for (i = 0; i < size; i++)
{
- phase = AXIS2_ARRAY_LIST_GET(op_out_faultphases, env, i);
+ phase = axis2_array_list_get(op_out_faultphases, env, i);
AXIS2_PHASE_FREE(phase, env);
phase = NULL;
}
- AXIS2_ARRAY_LIST_FREE(op_out_faultphases, env);
+ axis2_array_list_free(op_out_faultphases, env);
op_out_faultphases = NULL;
return NULL;
@@ -878,7 +878,7 @@
int size = 0, i = 0;
axis2_array_list_t *new_flow = NULL;
if(flow_to_copy)
- size = AXIS2_ARRAY_LIST_SIZE((axis2_array_list_t *) flow_to_copy, env);
+ size = axis2_array_list_size((axis2_array_list_t *) flow_to_copy, env);
if(size > 0)
{
new_flow = axis2_array_list_create(env, 0);
@@ -890,9 +890,9 @@
}
for(i = 0; i < size; i++)
{
- void *item = AXIS2_ARRAY_LIST_GET((axis2_array_list_t *) flow_to_copy,
+ void *item = axis2_array_list_get((axis2_array_list_t *) flow_to_copy,
env, i);
- AXIS2_ARRAY_LIST_ADD(new_flow, env, item);
+ axis2_array_list_add(new_flow, env, item);
}
return new_flow;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Tue Mar 6 01:15:20 2007
@@ -359,11 +359,11 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "No %s in the folder.", folder_name);
return AXIS2_SUCCESS;
}
- size = AXIS2_ARRAY_LIST_SIZE(current_info_list, env);
+ size = axis2_array_list_size(current_info_list, env);
for (i = 0; i < size; i++) /* loop until empty */
{
axis2_file_t *file = NULL;
- file = AXIS2_ARRAY_LIST_GET(current_info_list, env, i);
+ file = axis2_array_list_get(current_info_list, env, i);
status = AXIS2_WS_INFO_LIST_ADD_WS_INFO_ITEM(listener_impl->info_list, env,
file, type);
if (AXIS2_SUCCESS != status)
@@ -371,15 +371,15 @@
int size_j = 0;
int j = 0;
- size_j = AXIS2_ARRAY_LIST_SIZE(current_info_list, env);
+ size_j = axis2_array_list_size(current_info_list, env);
for (j = 0; j < size_j; j++)
{
axis2_file_t *del_file = NULL;
- del_file = AXIS2_ARRAY_LIST_GET(current_info_list, env, j);
+ del_file = axis2_array_list_get(current_info_list, env, j);
AXIS2_FILE_FREE(del_file, env);
}
- AXIS2_ARRAY_LIST_FREE(current_info_list, env);
+ axis2_array_list_free(current_info_list, env);
current_info_list = NULL;
return status;
}
@@ -389,10 +389,10 @@
{
axis2_file_t *del_file = NULL;
- del_file = AXIS2_ARRAY_LIST_GET(current_info_list, env, i);
+ del_file = axis2_array_list_get(current_info_list, env, i);
AXIS2_FILE_FREE(del_file, env);
}
- AXIS2_ARRAY_LIST_FREE(current_info_list, env);
+ axis2_array_list_free(current_info_list, env);
current_info_list = NULL;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Tue Mar 6 01:15:20 2007
@@ -466,7 +466,7 @@
ops = axis2_svc_builder_process_ops(svc_builder, env, operation_itr);
if (ops)
{
- size = AXIS2_ARRAY_LIST_SIZE(ops, env);
+ size = axis2_array_list_size(ops, env);
}
for (i = 0; i < size; i++)
{
@@ -475,16 +475,16 @@
int j = 0;
int sizej = 0;
- op_desc = (axis2_op_t *) AXIS2_ARRAY_LIST_GET(ops, env, i);
+ op_desc = (axis2_op_t *) axis2_array_list_get(ops, env, i);
params = AXIS2_OP_GET_ALL_PARAMS(op_desc, env);
/* Adding wsa-mapping into service */
- sizej = AXIS2_ARRAY_LIST_SIZE(params, env);
+ sizej = axis2_array_list_size(params, env);
for (j = 0; j < sizej; j++)
{
axis2_param_t *param = NULL;
axis2_char_t *param_name = NULL;
- param = AXIS2_ARRAY_LIST_GET(params, env, j);
+ param = axis2_array_list_get(params, env, j);
param_name = AXIS2_PARAM_GET_NAME(param, env);
if (0 == AXIS2_STRCMP(param_name, AXIS2_WSA_MAPPING))
{
@@ -496,7 +496,7 @@
}
AXIS2_SVC_ADD_OP(builder_impl->svc, env, op_desc);
}
- AXIS2_ARRAY_LIST_FREE(ops, env);
+ axis2_array_list_free(ops, env);
/*
qmodule_config = axis2_qname_create(env, AXIS2_MODULECONFIG, NULL, NULL);
module_configs_itr = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(svc_element,
@@ -665,7 +665,7 @@
}
/* adding operation */
- status = AXIS2_ARRAY_LIST_ADD(ops, env, op_desc);
+ status = axis2_array_list_add(ops, env, op_desc);
}
return ops;
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Tue Mar 6 01:15:20 2007
@@ -266,7 +266,7 @@
deployable_svcs = AXIS2_ARCH_FILE_DATA_GET_DEPLOYABLE_SVCS(file_data,
env);
- AXIS2_ARRAY_LIST_ADD(deployable_svcs, env, axis_svc);
+ axis2_array_list_add(deployable_svcs, env, axis_svc);
AXIS2_SVC_SET_PARENT(axis_svc, env, svc_grp);
svc_builder = axis2_svc_builder_create_with_dep_engine_and_svc(env,
grp_builder->desc_builder->engine, axis_svc);
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Tue Mar 6 01:15:20 2007
@@ -181,16 +181,16 @@
int list_size = 0;
int i = 0;
- list_size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->current_info_lists, env);
+ list_size = axis2_array_list_size(info_list_impl->current_info_lists, env);
for (i = 0; i < list_size; i++)
{
axis2_char_t *file_name = NULL;
- file_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_list_impl->
+ file_name = (axis2_char_t *) axis2_array_list_get(info_list_impl->
current_info_lists, env, i);
AXIS2_FREE(env->allocator, file_name);
}
- AXIS2_ARRAY_LIST_FREE(info_list_impl->current_info_lists, env);
+ axis2_array_list_free(info_list_impl->current_info_lists, env);
info_list_impl->current_info_lists = NULL;
}
if (info_list_impl->info_list)
@@ -198,16 +198,16 @@
int list_size = 0;
int i = 0;
- list_size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->info_list, env);
+ list_size = axis2_array_list_size(info_list_impl->info_list, env);
for (i = 0; i < list_size; i++)
{
axis2_ws_info_t *ws_info = NULL;
- ws_info = (axis2_ws_info_t *) AXIS2_ARRAY_LIST_GET(info_list_impl->
+ ws_info = (axis2_ws_info_t *) axis2_array_list_get(info_list_impl->
info_list, env, i);
AXIS2_WS_INFO_FREE(ws_info, env);
}
- AXIS2_ARRAY_LIST_FREE(info_list_impl->info_list, env);
+ axis2_array_list_free(info_list_impl->info_list, env);
info_list_impl->info_list = NULL;
}
if (ws_info_list->ops)
@@ -234,7 +234,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
info_list_impl = AXIS2_INTF_TO_IMPL(info_list);
- size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->info_list, env);
+ size = axis2_array_list_size(info_list_impl->info_list, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
@@ -245,7 +245,7 @@
axis2_ws_info_t *ws_info = NULL;
ws_info = (axis2_ws_info_t *)
- AXIS2_ARRAY_LIST_GET(info_list_impl->info_list, env, i);
+ axis2_array_list_get(info_list_impl->info_list, env, i);
AXIS2_WS_INFO_FREE(ws_info, env);
}
return AXIS2_SUCCESS;
@@ -290,7 +290,7 @@
ws_info =
axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
env, info_list_name, last_modified_date, AXIS2_SVC);
- status = AXIS2_ARRAY_LIST_ADD(info_list_impl->info_list, env, ws_info);
+ status = axis2_array_list_add(info_list_impl->info_list, env, ws_info);
if (AXIS2_SUCCESS != status)
{
return status;
@@ -323,7 +323,7 @@
ws_info =
axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
env, info_list_name, last_modified_date, AXIS2_MODULE);
- status = AXIS2_ARRAY_LIST_ADD(info_list_impl->info_list, env, ws_info);
+ status = axis2_array_list_add(info_list_impl->info_list, env, ws_info);
if (AXIS2_SUCCESS != status)
{
return status;
@@ -343,7 +343,7 @@
}
}
- return AXIS2_ARRAY_LIST_ADD(info_list_impl->current_info_lists, env,
+ return axis2_array_list_add(info_list_impl->current_info_lists, env,
info_list_name);
}
@@ -360,13 +360,13 @@
AXIS2_PARAM_CHECK(env->error, file_name, NULL);
info_list_impl = AXIS2_INTF_TO_IMPL(info_list);
- size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->info_list, env);
+ size = axis2_array_list_size(info_list_impl->info_list, env);
for (i = 0; i < size; i++)
{
axis2_ws_info_t *ws_info = NULL;
axis2_char_t *file_name_l = NULL;
- ws_info = (axis2_ws_info_t *) AXIS2_ARRAY_LIST_GET(info_list_impl->
+ ws_info = (axis2_ws_info_t *) axis2_array_list_get(info_list_impl->
info_list, env, i);
file_name_l = AXIS2_WS_INFO_GET_FILE_NAME(ws_info, env);
if (0 == AXIS2_STRCMP(file_name_l, file_name))
@@ -427,7 +427,7 @@
{
return AXIS2_FAILURE;
}
- list_size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->info_list, env);
+ list_size = axis2_array_list_size(info_list_impl->info_list, env);
for (i = 0; i < list_size; i++)
{
int current_lists_size = 0;
@@ -436,15 +436,15 @@
axis2_bool_t exist = AXIS2_FALSE;
int j = 0;
- file_item = (axis2_ws_info_t *) AXIS2_ARRAY_LIST_GET(info_list_impl->
+ file_item = (axis2_ws_info_t *) axis2_array_list_get(info_list_impl->
info_list, env, i);
file_item_name = AXIS2_WS_INFO_GET_FILE_NAME(file_item, env);
- current_lists_size = AXIS2_ARRAY_LIST_SIZE(info_list_impl->
+ current_lists_size = axis2_array_list_size(info_list_impl->
current_info_lists, env);
for (j = 0; j < current_lists_size; j++)
{
axis2_char_t *file_name = NULL;
- file_name = (axis2_char_t *) AXIS2_ARRAY_LIST_GET(info_list_impl->
+ file_name = (axis2_char_t *) axis2_array_list_get(info_list_impl->
current_info_lists, env, j);
if (0 == AXIS2_STRCMP(file_name, file_item_name))
{
@@ -460,7 +460,7 @@
last_modified_date = AXIS2_WS_INFO_GET_LAST_MODIFIED_DATE(file_item,
env);
- AXIS2_ARRAY_LIST_ADD(temp_list, env, file_item);
+ axis2_array_list_add(temp_list, env, file_item);
ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date(
env, file_item_name, last_modified_date);
/* this is to be undeployed */
@@ -470,18 +470,18 @@
}
- list_size = AXIS2_ARRAY_LIST_SIZE(temp_list, env);
+ list_size = axis2_array_list_size(temp_list, env);
for (i = 0; i < list_size; i++)
{
axis2_ws_info_t *file_item = NULL;
int index = 0;
- file_item = (axis2_ws_info_t*) AXIS2_ARRAY_LIST_GET(temp_list, env, i);
- index = AXIS2_ARRAY_LIST_INDEX_OF(info_list_impl->info_list, env,
+ file_item = (axis2_ws_info_t*) axis2_array_list_get(temp_list, env, i);
+ index = axis2_array_list_index_of(info_list_impl->info_list, env,
file_item);
- AXIS2_ARRAY_LIST_REMOVE(info_list_impl->info_list, env, index);
+ axis2_array_list_remove(info_list_impl->info_list, env, index);
}
- AXIS2_ARRAY_LIST_FREE(temp_list, env);
+ axis2_array_list_free(temp_list, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/description/client_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/client_utils.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/client_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/client_utils.c Tue Mar 6 01:15:20 2007
@@ -93,10 +93,10 @@
axis2_svc = axis2_svc_create(env);
wsdl_svcs = WODEN_DESC_GET_SVCS(desc, env);
if (wsdl_svcs)
- no_of_svcs = AXIS2_ARRAY_LIST_SIZE(wsdl_svcs, env);
+ no_of_svcs = axis2_array_list_size(wsdl_svcs, env);
for (i = 0; i < no_of_svcs; i++)
{
- wsdl_svc = AXIS2_ARRAY_LIST_GET(wsdl_svcs, env, i);
+ wsdl_svc = axis2_array_list_get(wsdl_svcs, env, i);
svc_qname = WODEN_SVC_GET_QNAME(wsdl_svc, env);
/* if wsdl_svc_qname is NULL we take the first service as the
* requested service
@@ -133,10 +133,10 @@
}
endpoints = WODEN_SVC_GET_ENDPOINTS(wsdl_svc, env);
if (endpoints)
- no_of_endpoints = AXIS2_ARRAY_LIST_SIZE(endpoints, env);
+ no_of_endpoints = axis2_array_list_size(endpoints, env);
for (i = 0; i < no_of_endpoints; i++)
{
- endpoint = AXIS2_ARRAY_LIST_GET(endpoints, env, i);
+ endpoint = axis2_array_list_get(endpoints, env, i);
ep_ncname = WODEN_ENDPOINT_GET_NAME(endpoint, env);
/* if endpoint_name is NULL we take the first endpoint as the
* requested service
@@ -174,7 +174,7 @@
if (binding)
binding_ops = WODEN_BINDING_GET_BINDING_OPS(binding, env);
if (binding_ops)
- no_of_binding_ops = AXIS2_ARRAY_LIST_SIZE(binding_ops, env);
+ no_of_binding_ops = axis2_array_list_size(binding_ops, env);
for (i = 0; i < no_of_binding_ops; i++)
{
void *binding_op = NULL;
@@ -189,14 +189,14 @@
axis2_uri_t *mep_uri = NULL;
axis2_char_t *mep_str = NULL;
- binding_op = AXIS2_ARRAY_LIST_GET(binding_ops, env, i);
+ binding_op = axis2_array_list_get(binding_ops, env, i);
if (binding_op)
interface_op = WODEN_BINDING_OP_GET_INTERFACE_OP(binding_op, env);
if (interface_op)
interface_msg_refs = WODEN_INTERFACE_OP_GET_INTERFACE_MSG_REFS(
interface_op, env);
if (interface_msg_refs)
- no_of_interface_msg_refs = AXIS2_ARRAY_LIST_SIZE(
+ no_of_interface_msg_refs = axis2_array_list_size(
interface_msg_refs, env);
for (j = 0; j < no_of_interface_msg_refs; j++)
{
@@ -204,7 +204,7 @@
void *direction = NULL;
axis2_char_t *str_direction = NULL;
- interface_msg_ref = AXIS2_ARRAY_LIST_GET(interface_msg_refs,
+ interface_msg_ref = axis2_array_list_get(interface_msg_refs,
env, j);
direction = WODEN_INTERFACE_MSG_REF_GET_DIRECTION(
interface_msg_ref, env);
@@ -233,7 +233,7 @@
ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(binding_op,
env);
if (ext_elements)
- size = AXIS2_ARRAY_LIST_SIZE(ext_elements, env);
+ size = axis2_array_list_size(ext_elements, env);
for (j = 0; j < size; j++)
{
/* process ext elements */
@@ -257,10 +257,10 @@
wsdl_svcs = WODEN_WSDL10_DESC_GET_SVCS(desc, env);
if (wsdl_svcs)
- no_of_svcs = AXIS2_ARRAY_LIST_SIZE(wsdl_svcs, env);
+ no_of_svcs = axis2_array_list_size(wsdl_svcs, env);
for (i = 0; i < no_of_svcs; i++)
{
- wsdl_svc = AXIS2_ARRAY_LIST_GET(wsdl_svcs, env, i);
+ wsdl_svc = axis2_array_list_get(wsdl_svcs, env, i);
svc_qname = WODEN_WSDL10_SVC_GET_QNAME(wsdl_svc, env);
/* if wsdl_svc_qname is NULL we take the first service as the
* requested service
@@ -298,10 +298,10 @@
if(wsdl_svc)
endpoints = WODEN_WSDL10_SVC_GET_ENDPOINTS(wsdl_svc, env);
if (endpoints)
- no_of_endpoints = AXIS2_ARRAY_LIST_SIZE(endpoints, env);
+ no_of_endpoints = axis2_array_list_size(endpoints, env);
for (i = 0; i < no_of_endpoints; i++)
{
- endpoint = AXIS2_ARRAY_LIST_GET(endpoints, env, i);
+ endpoint = axis2_array_list_get(endpoints, env, i);
ep_ncname = WODEN_WSDL10_ENDPOINT_GET_NAME(endpoint, env);
/* if endpoint_name is NULL we take the first endpoint as the
* requested service
@@ -334,12 +334,12 @@
ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(endpoint,
env);
if (ext_elements)
- size = AXIS2_ARRAY_LIST_SIZE(ext_elements, env);
+ size = axis2_array_list_size(ext_elements, env);
for (j = 0; j < size; j++)
{
void *ext_element = NULL;
- ext_element = AXIS2_ARRAY_LIST_GET(ext_elements, env, j);
+ ext_element = axis2_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
{
@@ -372,7 +372,7 @@
if (binding)
binding_ops = WODEN_BINDING_GET_BINDING_OPS(binding, env);
if (binding_ops)
- no_of_binding_ops = AXIS2_ARRAY_LIST_SIZE(binding_ops, env);
+ no_of_binding_ops = axis2_array_list_size(binding_ops, env);
for (i = 0; i < no_of_binding_ops; i++)
{
void *binding_op = NULL;
@@ -390,13 +390,13 @@
axis2_uri_t *mep_uri = NULL;
axis2_char_t *mep_str = NULL;
- binding_op = AXIS2_ARRAY_LIST_GET(binding_ops, env, i);
+ binding_op = axis2_array_list_get(binding_ops, env, i);
interface_op = WODEN_WSDL10_BINDING_OP_GET_INTERFACE_OP(binding_op,
env);
interface_msg_refs = WODEN_INTERFACE_OP_GET_INTERFACE_MSG_REFS(
interface_op, env);
if (interface_msg_refs)
- no_of_interface_msg_refs = AXIS2_ARRAY_LIST_SIZE(
+ no_of_interface_msg_refs = axis2_array_list_size(
interface_msg_refs, env);
for (j = 0; j < no_of_interface_msg_refs; j++)
{
@@ -404,7 +404,7 @@
void *direction = NULL;
axis2_char_t *str_direction = NULL;
- interface_msg_ref = AXIS2_ARRAY_LIST_GET(interface_msg_refs,
+ interface_msg_ref = axis2_array_list_get(interface_msg_refs,
env, j);
direction = WODEN_WSDL10_INTERFACE_MSG_REF_GET_DIRECTION(
interface_msg_ref, env);
@@ -436,12 +436,12 @@
ext_elements = WODEN_ELEMENT_EXTENSIBLE_GET_EXT_ELEMENTS(binding_op,
env);
if (ext_elements)
- size = AXIS2_ARRAY_LIST_SIZE(ext_elements, env);
+ size = axis2_array_list_size(ext_elements, env);
for (j = 0; j < size; j++)
{
void *ext_element = NULL;
- ext_element = AXIS2_ARRAY_LIST_GET(ext_elements, env, j);
+ ext_element = axis2_array_list_get(ext_elements, env, j);
ext_type = WODEN_EXT_ELEMENT_GET_EXT_TYPE(ext_element, env);
if (AXIS2_TRUE == AXIS2_QNAME_EQUALS(ext_type, env, ext_type_l))
{
Modified: webservices/axis2/trunk/c/modules/core/description/flow.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/flow.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow.c Tue Mar 6 01:15:20 2007
@@ -63,16 +63,16 @@
int i = 0;
int size = 0;
- size = AXIS2_ARRAY_LIST_SIZE(flow->list, env);
+ size = axis2_array_list_size(flow->list, env);
for (i = 0; i < size; i++)
{
axis2_handler_desc_t *handler_desc = NULL;
- handler_desc = (axis2_handler_desc_t *) AXIS2_ARRAY_LIST_GET(
+ handler_desc = (axis2_handler_desc_t *) axis2_array_list_get(
flow->list, env, i);
AXIS2_HANDLER_DESC_FREE(handler_desc, env);
}
- AXIS2_ARRAY_LIST_FREE(flow->list, env);
+ axis2_array_list_free(flow->list, env);
flow->list = NULL;
}
@@ -116,7 +116,7 @@
return AXIS2_FAILURE;
}
}
- return AXIS2_ARRAY_LIST_ADD(flow->list, env, handler);
+ return axis2_array_list_add(flow->list, env, handler);
}
AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
@@ -127,7 +127,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_ARRAY_LIST_GET(flow->list, env, index);
+ return axis2_array_list_get(flow->list, env, index);
}
AXIS2_EXTERN int AXIS2_CALL
@@ -137,6 +137,6 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return AXIS2_ARRAY_LIST_SIZE(flow->list, env);
+ return axis2_array_list_size(flow->list, env);
}
Modified: webservices/axis2/trunk/c/modules/core/description/msg.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/msg.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/msg.c Tue Mar 6 01:15:20 2007
@@ -86,7 +86,7 @@
if (msg->flow)
{
- AXIS2_ARRAY_LIST_FREE(msg->flow, env);
+ axis2_array_list_free(msg->flow, env);
msg->flow = NULL;
}
@@ -243,7 +243,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (msg->flow)
{
- AXIS2_ARRAY_LIST_FREE(msg->flow, env);
+ axis2_array_list_free(msg->flow, env);
msg->flow = NULL;
}
if (flow)
@@ -342,7 +342,7 @@
xml_schema_t *schema = NULL;
xml_schema_obj_collection_t *schema_collection = NULL;
- schema = AXIS2_ARRAY_LIST_GET(schemas, env, i);
+ schema = axis2_array_list_get(schemas, env, i);
schema_collection = XML_SCHEMA_GET_ITEMS(schema, env);
if (schema_collection)
{
Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=515039&r1=515038&r2=515039
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Tue Mar 6 01:15:20 2007
@@ -213,10 +213,10 @@
if (op->module_qnames)
{
int i = 0;
- for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op->module_qnames, env); i++)
+ for (i = 0; i < axis2_array_list_size(op->module_qnames, env); i++)
{
axis2_qname_t *module_ref = NULL;
- module_ref = AXIS2_ARRAY_LIST_GET(op->module_qnames, env, i);
+ module_ref = axis2_array_list_get(op->module_qnames, env, i);
if (module_ref)
{
@@ -224,17 +224,17 @@
module_ref = NULL;
}
}
- AXIS2_ARRAY_LIST_FREE(op->module_qnames, env);
+ axis2_array_list_free(op->module_qnames, env);
op->module_qnames = NULL;
}
if (op->engaged_module_list)
{
- AXIS2_ARRAY_LIST_FREE(op->engaged_module_list, env);
+ axis2_array_list_free(op->engaged_module_list, env);
op->engaged_module_list = NULL;
}
if (op->wsamapping_list)
{
- AXIS2_ARRAY_LIST_FREE(op->wsamapping_list, env);
+ axis2_array_list_free(op->wsamapping_list, env);
op->wsamapping_list = NULL;
}
@@ -527,7 +527,7 @@
collection_module = op->engaged_module_list;
if (collection_module)
- size = AXIS2_ARRAY_LIST_SIZE(collection_module, env);
+ size = axis2_array_list_size(collection_module, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
@@ -538,7 +538,7 @@
const axis2_qname_t *qname1 = NULL;
const axis2_qname_t *qname2 = NULL;
- module_desc = (axis2_module_desc_t *) AXIS2_ARRAY_LIST_GET(
+ module_desc = (axis2_module_desc_t *) axis2_array_list_get(
collection_module, env, index);
if (!module_desc)
{
@@ -575,7 +575,7 @@
}
if (AXIS2_TRUE == need_to_add)
{
- AXIS2_ARRAY_LIST_ADD(collection_module, env, moduleref);
+ axis2_array_list_add(collection_module, env, moduleref);
}
}
else
@@ -604,7 +604,7 @@
{
op->engaged_module_list = axis2_array_list_create(env, 0);
}
- size = AXIS2_ARRAY_LIST_SIZE(op->engaged_module_list, env);
+ size = axis2_array_list_size(op->engaged_module_list, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -615,7 +615,7 @@
{
const axis2_qname_t *module_qname_l = NULL;
- module_desc_l = (axis2_module_desc_t *) AXIS2_ARRAY_LIST_GET(
+ module_desc_l = (axis2_module_desc_t *) axis2_array_list_get(
op->engaged_module_list, env, index);
module_qname_l = AXIS2_MODULE_DESC_GET_QNAME(module_desc_l, env);
if (AXIS2_QNAME_EQUALS(module_qname, env, module_qname_l))
@@ -624,7 +624,7 @@
}
}
- return AXIS2_ARRAY_LIST_ADD(op->engaged_module_list, env, module_desc);
+ return axis2_array_list_add(op->engaged_module_list, env, module_desc);
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
@@ -876,7 +876,7 @@
AXIS2_PARAM_CHECK(env->error, module_qname, AXIS2_FAILURE);
module_qname_l = AXIS2_QNAME_CLONE((axis2_qname_t *)module_qname, env);
- return AXIS2_ARRAY_LIST_ADD(op->module_qnames, env, module_qname_l);
+ return axis2_array_list_add(op->module_qnames, env, module_qname_l);
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
@@ -1197,7 +1197,7 @@
if (op->wsamapping_list)
{
- AXIS2_ARRAY_LIST_FREE(op->wsamapping_list, env);
+ axis2_array_list_free(op->wsamapping_list, env);
op->wsamapping_list = NULL;
}
op->wsamapping_list = mapping_list;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org