You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/30 15:19:59 UTC
svn commit: r524073 [3/10] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/src/util/ include/ modules/core/addr/
modules/core/clientapi/ modules/core/context/ modules/...
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Fri Mar 30 06:19:43 2007
@@ -30,9 +30,9 @@
int mep;
/* to store deploy time modules */
- axis2_array_list_t *module_qnames;
- axis2_array_list_t *engaged_module_list;
- axis2_array_list_t *wsamapping_list;
+ axutil_array_list_t *module_qnames;
+ axutil_array_list_t *engaged_module_list;
+ axutil_array_list_t *wsamapping_list;
axis2_bool_t from_module;
axis2_qname_t *qname;
axis2_char_t *msg_exchange_pattern;
@@ -208,25 +208,25 @@
if (op->module_qnames)
{
int i = 0;
- for (i = 0; i < axis2_array_list_size(op->module_qnames, env); i++)
+ for (i = 0; i < axutil_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 = axutil_array_list_get(op->module_qnames, env, i);
if (module_ref)
{
axis2_qname_free(module_ref, env);
}
}
- axis2_array_list_free(op->module_qnames, env);
+ axutil_array_list_free(op->module_qnames, env);
}
if (op->engaged_module_list)
{
- axis2_array_list_free(op->engaged_module_list, env);
+ axutil_array_list_free(op->engaged_module_list, env);
}
if (op->wsamapping_list)
{
- axis2_array_list_free(op->wsamapping_list, env);
+ axutil_array_list_free(op->wsamapping_list, env);
}
if (op->qname)
@@ -309,7 +309,7 @@
return param;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_op_get_all_params(const axis2_op_t *op,
const axis2_env_t *env)
{
@@ -476,7 +476,7 @@
{
int index = 0;
int size = 0;
- axis2_array_list_t *collection_module = NULL;
+ axutil_array_list_t *collection_module = NULL;
axis2_module_desc_t *module_desc = NULL;
axis2_phase_resolver_t *pr = NULL;
axis2_bool_t need_to_add = AXIS2_FALSE;
@@ -488,7 +488,7 @@
collection_module = op->engaged_module_list;
if (collection_module)
{
- size = axis2_array_list_size(collection_module, env);
+ size = axutil_array_list_size(collection_module, env);
}
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -500,7 +500,7 @@
const axis2_qname_t *qname1 = NULL;
const axis2_qname_t *qname2 = NULL;
- module_desc = (axis2_module_desc_t *) axis2_array_list_get(collection_module,
+ module_desc = (axis2_module_desc_t *) axutil_array_list_get(collection_module,
env, index);
if (!module_desc)
{
@@ -534,7 +534,7 @@
if (AXIS2_TRUE == need_to_add)
{
- axis2_array_list_add(collection_module, env, moduleref);
+ axutil_array_list_add(collection_module, env, moduleref);
}
}
else
@@ -560,9 +560,9 @@
if (!op->engaged_module_list)
{
- op->engaged_module_list = axis2_array_list_create(env, 0);
+ op->engaged_module_list = axutil_array_list_create(env, 0);
}
- size = axis2_array_list_size(op->engaged_module_list, env);
+ size = axutil_array_list_size(op->engaged_module_list, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -574,7 +574,7 @@
const axis2_qname_t *module_qname_l = NULL;
module_desc_l =
- (axis2_module_desc_t *) axis2_array_list_get(op->engaged_module_list, env, index);
+ (axis2_module_desc_t *) axutil_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))
@@ -584,10 +584,10 @@
}
- return axis2_array_list_add(op->engaged_module_list, env, module_desc);
+ return axutil_array_list_add(op->engaged_module_list, env, module_desc);
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_op_get_all_modules(const axis2_op_t *op,
const axis2_env_t *env)
{
@@ -659,7 +659,7 @@
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_op_get_fault_in_flow(const axis2_op_t *op,
const axis2_env_t *env)
{
@@ -676,7 +676,7 @@
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_op_get_fault_out_flow(const axis2_op_t *op,
const axis2_env_t *env)
{
@@ -693,7 +693,7 @@
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_op_get_out_flow(const axis2_op_t *op,
const axis2_env_t *env)
{
@@ -710,7 +710,7 @@
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_op_get_in_flow(const axis2_op_t *op,
const axis2_env_t *env)
{
@@ -729,7 +729,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_set_fault_in_flow(axis2_op_t *op,
const axis2_env_t *env,
- axis2_array_list_t *list)
+ axutil_array_list_t *list)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, list, AXIS2_FAILURE);
@@ -749,7 +749,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_set_fault_out_flow(axis2_op_t *op,
const axis2_env_t *env,
- axis2_array_list_t *list)
+ axutil_array_list_t *list)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, list, AXIS2_FAILURE);
@@ -768,7 +768,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_set_out_flow(axis2_op_t *op,
const axis2_env_t *env,
- axis2_array_list_t *list)
+ axutil_array_list_t *list)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, list, AXIS2_FAILURE);
@@ -789,7 +789,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_set_in_flow(axis2_op_t *op,
const axis2_env_t *env,
- axis2_array_list_t *list)
+ axutil_array_list_t *list)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, list, AXIS2_FAILURE);
@@ -817,10 +817,10 @@
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 axutil_array_list_add(op->module_qnames, env, module_qname_l);
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_op_get_all_module_qnames(const axis2_op_t *op,
const axis2_env_t *env)
{
@@ -1121,21 +1121,21 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_op_set_wsamapping_list(axis2_op_t *op,
const axis2_env_t *env,
- axis2_array_list_t *mapping_list)
+ axutil_array_list_t *mapping_list)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, mapping_list, AXIS2_FAILURE);
if (op->wsamapping_list)
{
- axis2_array_list_free(op->wsamapping_list, env);
+ axutil_array_list_free(op->wsamapping_list, env);
op->wsamapping_list = NULL;
}
op->wsamapping_list = mapping_list;
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_op_get_wsamapping_list(axis2_op_t *op,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Fri Mar 30 06:19:43 2007
@@ -29,7 +29,7 @@
long last_update;
axis2_char_t *filename;
/** to store module descriptions at deploy time parsing */
- axis2_array_list_t *module_list;
+ axutil_array_list_t *module_list;
/* service description */
axis2_char_t *svc_desc;
@@ -42,7 +42,7 @@
/* to keep the XML scheama either from WSDL or
* C2WSDL(in the future)
*/
- axis2_array_list_t *schema_list;
+ axutil_array_list_t *schema_list;
/**
* A table that keeps a mapping of unique XSD names (Strings)
* against the schema objects. This is populated in the first
@@ -85,7 +85,7 @@
void *impl_class;
axis2_qname_t *qname;
axis2_char_t *style;
- axis2_array_list_t *engaged_modules;
+ axutil_array_list_t *engaged_modules;
/** parameter container to hold service related parameters */
struct axis2_param_container *param_container;
/** flow container that encapsulates the flow related data */
@@ -166,7 +166,7 @@
return NULL;
}
- svc->module_list = axis2_array_list_create(env, 0);
+ svc->module_list = axutil_array_list_create(env, 0);
if (! svc->module_list)
{
axis2_svc_free(svc, env);
@@ -174,7 +174,7 @@
return NULL;
}
- svc->schema_list = axis2_array_list_create(env,
+ svc->schema_list = axutil_array_list_create(env,
AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
if (! svc->schema_list)
{
@@ -182,7 +182,7 @@
return NULL;
}
- svc->engaged_modules = axis2_array_list_create(env,
+ svc->engaged_modules = axutil_array_list_create(env,
AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
if (! svc->engaged_modules)
{
@@ -277,27 +277,27 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(svc->module_list, env);
+ size = axutil_array_list_size(svc->module_list, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
- qname = axis2_array_list_get(svc->module_list, env, i);
+ qname = axutil_array_list_get(svc->module_list, env, i);
if (qname)
{
axis2_qname_free(qname, env);
}
}
- axis2_array_list_free(svc->module_list, env);
+ axutil_array_list_free(svc->module_list, env);
}
if (svc->schema_list)
{
- axis2_array_list_free(svc->schema_list, env);
+ axutil_array_list_free(svc->schema_list, env);
}
if (svc->engaged_modules)
{
- axis2_array_list_free(svc->engaged_modules, env);
+ axutil_array_list_free(svc->engaged_modules, env);
}
if (svc->axis_svc_name)
@@ -549,7 +549,7 @@
return param;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_svc_get_all_params(const axis2_svc_t *svc,
const axis2_env_t *env)
{
@@ -611,7 +611,7 @@
if (status)
{
const axis2_qname_t *qname = NULL;
- status = axis2_array_list_add(svc->engaged_modules, env, module_desc);
+ status = axutil_array_list_add(svc->engaged_modules, env, module_desc);
qname = axis2_module_desc_get_qname(module_desc, env);
axis2_svc_add_module_qname(svc, env, qname);
}
@@ -629,13 +629,13 @@
axis2_qname_t *module_qname)
{
int i = 0, size = 0;
- size = axis2_array_list_size(svc->engaged_modules, env);
+ size = axutil_array_list_size(svc->engaged_modules, env);
for (i = 0; i < size; i++)
{
const axis2_qname_t *module_qname_l = NULL;
axis2_module_desc_t *module_desc_l = NULL;
- module_desc_l = (axis2_module_desc_t *) axis2_array_list_get(
+ module_desc_l = (axis2_module_desc_t *) axutil_array_list_get(
svc->engaged_modules, env, i);
module_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
@@ -674,7 +674,7 @@
for (index = axis2_hash_first(map, env); index; index =
axis2_hash_next(env, index))
{
- axis2_array_list_t *mappings_list = NULL;
+ axutil_array_list_t *mappings_list = NULL;
int size = 0;
int j = 0;
void *v = NULL;
@@ -682,7 +682,7 @@
op_desc = (axis2_op_t *) v;
mappings_list = axis2_op_get_wsamapping_list(op_desc, env);
/* adding WSA mapping into service */
- size = axis2_array_list_size(mappings_list, env);
+ size = axutil_array_list_size(mappings_list, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -696,7 +696,7 @@
{
axis2_char_t *mapping = NULL;
- mapping = (axis2_char_t *) axis2_array_list_get(mappings_list, env, j);
+ mapping = (axis2_char_t *) axutil_array_list_get(mappings_list, env, j);
status = axis2_svc_add_mapping(svc, env, mapping, op_desc);
if (AXIS2_SUCCESS != status)
{
@@ -873,11 +873,11 @@
AXIS2_PARAM_CHECK(env->error, module_qname, AXIS2_FAILURE);
qmodule_qname_l = axis2_qname_clone((axis2_qname_t *)module_qname, env);
- return axis2_array_list_add(svc->module_list, env,
+ return axutil_array_list_add(svc->module_list, env,
qmodule_qname_l);
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_svc_get_all_module_qnames(const axis2_svc_t *svc,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Fri Mar 30 06:19:43 2007
@@ -25,11 +25,11 @@
/** map of services */
axis2_hash_t *svcs;
/** to store service group modules QNames */
- axis2_array_list_t *module_qnames;
+ axutil_array_list_t *module_qnames;
/** to store module ref at deploy time parsing */
axis2_conf_t *parent;
/** list of module references */
- axis2_array_list_t *module_list;
+ axutil_array_list_t *module_list;
/** parameter container to hold service related parameters */
axis2_param_container_t *param_container;
};
@@ -64,7 +64,7 @@
return NULL;
}
- svc_grp->module_qnames = axis2_array_list_create(env, 20);
+ svc_grp->module_qnames = axutil_array_list_create(env, 20);
if (!svc_grp->module_qnames)
{
axis2_svc_grp_free(svc_grp, env);
@@ -72,7 +72,7 @@
return NULL;
}
- svc_grp->module_list = axis2_array_list_create(env, 0);
+ svc_grp->module_list = axutil_array_list_create(env, 0);
if (!svc_grp->module_list)
{
axis2_svc_grp_free(svc_grp, env);
@@ -135,12 +135,12 @@
if (svc_grp->module_qnames)
{
- axis2_array_list_free(svc_grp->module_qnames, env);
+ axutil_array_list_free(svc_grp->module_qnames, env);
}
if (svc_grp->module_list)
{
- axis2_array_list_free(svc_grp->module_list, env);
+ axutil_array_list_free(svc_grp->module_list, env);
}
if (svc_grp)
@@ -332,7 +332,7 @@
return param;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_svc_grp_get_all_params(
const axis2_svc_grp_t *svc_grp,
const axis2_env_t *env)
@@ -386,7 +386,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return axis2_array_list_add(svc_grp->module_qnames, env,
+ return axutil_array_list_add(svc_grp->module_qnames, env,
module_qname);
}
@@ -433,14 +433,14 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
- size = axis2_array_list_size(svc_grp->module_qnames, env);
+ size = axutil_array_list_size(svc_grp->module_qnames, env);
if (AXIS2_TRUE != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
return AXIS2_FAILURE;
}
for (i = 0; size; i++)
{
- modu = axis2_array_list_get(svc_grp->module_qnames, env, i);
+ modu = axutil_array_list_get(svc_grp->module_qnames, env, i);
modu_local = axis2_qname_get_localpart(modu, env);
module_name_local = axis2_qname_get_localpart(module_name, env);
if (0 == axis2_strcmp(modu_local, module_name_local))
@@ -499,7 +499,7 @@
return axis2_svc_grp_add_module_qname(svc_grp, env, module_name);
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_svc_grp_get_all_module_qnames(
const axis2_svc_grp_t *svc_grp,
const axis2_env_t *env)
@@ -518,14 +518,14 @@
if (!svc_grp->module_list)
{
- svc_grp->module_list = axis2_array_list_create(env, 0);
+ svc_grp->module_list = axutil_array_list_create(env, 0);
if (!svc_grp->module_list)
return AXIS2_FAILURE;
}
- return axis2_array_list_add(svc_grp->module_list, env, moduleref);
+ return axutil_array_list_add(svc_grp->module_list, env, moduleref);
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_svc_grp_get_all_module_refs(
const axis2_svc_grp_t *svc_grp,
const axis2_env_t *env)
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Fri Mar 30 06:19:43 2007
@@ -32,16 +32,16 @@
/**
* Field modules
*/
- axis2_array_list_t *engaged_modules;
+ axutil_array_list_t *engaged_modules;
/*to store all the available modules (including version)*/
axis2_hash_t *all_modules;
/*to store mapping between default version to module name*/
axis2_hash_t *name_to_version_map;
- axis2_array_list_t *out_phases;
- axis2_array_list_t *in_fault_phases;
- axis2_array_list_t *out_fault_phases;
+ axutil_array_list_t *out_phases;
+ axutil_array_list_t *in_fault_phases;
+ axutil_array_list_t *out_fault_phases;
- axis2_array_list_t *in_phases_upto_and_including_post_dispatch;
+ axutil_array_list_t *in_phases_upto_and_including_post_dispatch;
axis2_phases_info_t *phases_info;
axis2_hash_t *all_svcs;
axis2_hash_t *msg_recvs;
@@ -49,7 +49,7 @@
axis2_hash_t *faulty_modules;
axis2_char_t *axis2_repo;
axis2_dep_engine_t *dep_engine;
- axis2_array_list_t *handlers;
+ axutil_array_list_t *handlers;
axis2_bool_t enable_mtom;
/*This is used in rampart*/
axis2_bool_t enable_security;
@@ -124,7 +124,7 @@
conf->transports_out[i] = NULL;
}
- conf->engaged_modules = axis2_array_list_create(env, 0);
+ conf->engaged_modules = axutil_array_list_create(env, 0);
if (! conf->engaged_modules)
{
axis2_conf_free(conf, env);
@@ -132,7 +132,7 @@
return NULL;
}
- conf->handlers = axis2_array_list_create(env, 0);
+ conf->handlers = axutil_array_list_create(env, 0);
if (! conf->handlers)
{
axis2_conf_free(conf, env);
@@ -141,7 +141,7 @@
}
conf->in_phases_upto_and_including_post_dispatch =
- axis2_array_list_create(env, 0);
+ axutil_array_list_create(env, 0);
if (! conf->in_phases_upto_and_including_post_dispatch)
{
axis2_conf_free(conf, env);
@@ -167,11 +167,11 @@
handler = axis2_disp_get_base(uri_dispatch, env);
axis2_disp_free(uri_dispatch, env);
axis2_phase_add_handler_at(phase, env, 0, handler);
- axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
+ axutil_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = NULL;
}
- status = axis2_array_list_add(conf->
+ status = axutil_array_list_add(conf->
in_phases_upto_and_including_post_dispatch, env, phase);
if (AXIS2_FAILURE == status)
{
@@ -186,7 +186,7 @@
axis2_conf_free(conf, env);
return NULL;
}
- status = axis2_array_list_add(conf->
+ status = axutil_array_list_add(conf->
in_phases_upto_and_including_post_dispatch, env, phase);
if (AXIS2_FAILURE == status)
{
@@ -340,44 +340,44 @@
if (conf->engaged_modules)
{
int i = 0;
- for (i = 0; i < axis2_array_list_size(conf->engaged_modules,
+ for (i = 0; i < axutil_array_list_size(conf->engaged_modules,
env); i++)
{
axis2_qname_t *module_desc_qname = NULL;
module_desc_qname = (axis2_qname_t *)
- axis2_array_list_get(conf->engaged_modules, env, i);
+ axutil_array_list_get(conf->engaged_modules, env, i);
if (module_desc_qname)
axis2_qname_free(module_desc_qname, env);
}
- axis2_array_list_free(conf->engaged_modules, env);
+ axutil_array_list_free(conf->engaged_modules, env);
}
if (conf->out_phases)
{
int i = 0;
- for (i = 0; i < axis2_array_list_size(conf->out_phases, env); i++)
+ for (i = 0; i < axutil_array_list_size(conf->out_phases, env); i++)
{
axis2_phase_t *phase = NULL;
phase = (axis2_phase_t *)
- axis2_array_list_get(conf->out_phases, env, i);
+ axutil_array_list_get(conf->out_phases, env, i);
if (phase)
axis2_phase_free(phase, env);
}
- axis2_array_list_free(conf->out_phases, env);
+ axutil_array_list_free(conf->out_phases, env);
}
if (conf->in_fault_phases)
{
int i = 0;
- for (i = 0; i < axis2_array_list_size(conf->in_fault_phases, env); i++)
+ for (i = 0; i < axutil_array_list_size(conf->in_fault_phases, env); i++)
{
axis2_phase_t *phase = NULL;
phase = (axis2_phase_t *)
- axis2_array_list_get(conf->in_fault_phases, env, i);
+ axutil_array_list_get(conf->in_fault_phases, env, i);
if (phase)
axis2_phase_free(phase, env);
}
- axis2_array_list_free(conf->in_fault_phases, env);
+ axutil_array_list_free(conf->in_fault_phases, env);
}
if (conf->out_fault_phases)
@@ -385,23 +385,23 @@
/* No need of the following commented lines. Phases are freed in
* phase_info
*/
- axis2_array_list_free(conf->out_fault_phases, env);
+ axutil_array_list_free(conf->out_fault_phases, env);
}
if (conf->in_phases_upto_and_including_post_dispatch)
{
int i = 0;
- for (i = 0; i < axis2_array_list_size(conf->
+ for (i = 0; i < axutil_array_list_size(conf->
in_phases_upto_and_including_post_dispatch, env); i++)
{
axis2_phase_t *phase = NULL;
- phase = (axis2_phase_t *) axis2_array_list_get(conf->
+ phase = (axis2_phase_t *) axutil_array_list_get(conf->
in_phases_upto_and_including_post_dispatch, env, i);
if (phase)
axis2_phase_free(phase, env);
}
- axis2_array_list_free(conf->
+ axutil_array_list_free(conf->
in_phases_upto_and_including_post_dispatch, env);
}
@@ -453,16 +453,16 @@
if (conf->handlers)
{
int i = 0;
- for (i = 0; i < axis2_array_list_size(conf->handlers, env); i++)
+ for (i = 0; i < axutil_array_list_size(conf->handlers, env); i++)
{
axis2_handler_desc_t *handler_desc = NULL;
handler_desc = (axis2_handler_desc_t *)
- axis2_array_list_get(conf->handlers, env, i);
+ axutil_array_list_get(conf->handlers, env, i);
if (handler_desc)
axis2_handler_desc_free(handler_desc, env);
}
- axis2_array_list_free(conf->handlers, env);
+ axutil_array_list_free(conf->handlers, env);
}
if (conf->axis2_repo)
@@ -709,7 +709,7 @@
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_conf_get_all_params(
const axis2_conf_t *conf,
const axis2_env_t *env)
@@ -831,7 +831,7 @@
return ret;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_conf_get_all_engaged_modules(
const axis2_conf_t *conf,
const axis2_env_t *env)
@@ -839,7 +839,7 @@
return conf->engaged_modules;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_conf_get_in_phases_upto_and_including_post_dispatch(
const axis2_conf_t *conf,
const axis2_env_t *env)
@@ -847,7 +847,7 @@
return conf->in_phases_upto_and_including_post_dispatch;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_conf_get_out_flow(
const axis2_conf_t *conf,
const axis2_env_t *env)
@@ -855,7 +855,7 @@
return conf->out_phases;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_conf_get_in_fault_flow(
const axis2_conf_t *conf,
const axis2_env_t *env)
@@ -863,7 +863,7 @@
return conf->in_fault_phases;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_conf_get_out_fault_flow(
const axis2_conf_t *conf,
const axis2_env_t *env)
@@ -956,13 +956,13 @@
{
def_mod_qname = axis2_module_desc_get_qname(def_mod, env);
}
- size = axis2_array_list_size(conf->engaged_modules, env);
+ size = axutil_array_list_size(conf->engaged_modules, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
- qname = (axis2_qname_t *) axis2_array_list_get(conf->
+ qname = (axis2_qname_t *) axutil_array_list_get(conf->
engaged_modules, env, i);
if (AXIS2_TRUE == axis2_qname_equals(module_name, env, qname) ||
@@ -1034,21 +1034,21 @@
axis2_conf_set_out_phases(
axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_array_list_t *out_phases)
+ axutil_array_list_t *out_phases)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, out_phases, AXIS2_FAILURE);
if (conf->out_phases)
{
- axis2_array_list_free(conf->out_phases, env);
+ axutil_array_list_free(conf->out_phases, env);
conf->out_phases = NULL;
}
conf->out_phases = out_phases;
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_conf_get_out_phases(
const axis2_conf_t *conf,
const axis2_env_t *env)
@@ -1060,14 +1060,14 @@
axis2_conf_set_in_fault_phases(
axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_array_list_t *list)
+ axutil_array_list_t *list)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, list, AXIS2_FAILURE);
if (conf->in_fault_phases)
{
- axis2_array_list_free(conf->in_fault_phases, env);
+ axutil_array_list_free(conf->in_fault_phases, env);
conf->in_fault_phases = NULL;
}
conf->in_fault_phases = list;
@@ -1078,14 +1078,14 @@
axis2_conf_set_out_fault_phases(
axis2_conf_t *conf,
const axis2_env_t *env,
- axis2_array_list_t *list)
+ axutil_array_list_t *list)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, list, AXIS2_FAILURE);
if (conf->out_fault_phases)
{
- axis2_array_list_free(conf->out_fault_phases, env);
+ axutil_array_list_free(conf->out_fault_phases, env);
conf->out_fault_phases = NULL;
}
conf->out_fault_phases = list;
@@ -1165,7 +1165,7 @@
handler = axis2_disp_get_base(soap_msg_body_based_dispatch, env);
axis2_disp_free(soap_msg_body_based_dispatch, env);
axis2_phase_add_handler_at(dispatch, env, 0, handler);
- axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
+ axutil_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
add_dispatch = axis2_addr_disp_create(env);
if (!add_dispatch)
@@ -1177,7 +1177,7 @@
handler = axis2_disp_get_base(add_dispatch, env);
axis2_disp_free(add_dispatch, env);
axis2_phase_add_handler_at(dispatch, env, 1, handler);
- axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
+ axutil_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
soap_action_based_dispatch = axiom_soap_action_disp_create(env);
if (!soap_action_based_dispatch)
@@ -1188,9 +1188,9 @@
handler = axis2_disp_get_base(soap_action_based_dispatch, env);
axis2_disp_free(soap_action_based_dispatch, env);
axis2_phase_add_handler_at(dispatch, env, 2, handler);
- axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
+ axutil_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
- status = axis2_array_list_add(conf->
+ status = axutil_array_list_add(conf->
in_phases_upto_and_including_post_dispatch, env, dispatch);
if (AXIS2_SUCCESS != status)
{
@@ -1209,13 +1209,13 @@
handler = axis2_disp_checker_get_base(disp_checker, env);
axis2_disp_checker_free(disp_checker, env);
axis2_phase_add_handler_at(post_dispatch, env, 0, handler);
- axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
+ axutil_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
handler = axis2_ctx_handler_create(env, NULL);
axis2_phase_add_handler_at(post_dispatch, env, 1, handler);
- axis2_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
+ axutil_array_list_add(conf->handlers, env, AXIS2_HANDLER_GET_HANDLER_DESC(handler, env));
- status = axis2_array_list_add(conf->
+ status = axutil_array_list_add(conf->
in_phases_upto_and_including_post_dispatch, env, post_dispatch);
if (AXIS2_SUCCESS != status)
{
@@ -1240,7 +1240,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, dispatch, AXIS2_FAILURE);
- status = axis2_array_list_add(conf->
+ status = axutil_array_list_add(conf->
in_phases_upto_and_including_post_dispatch, env, dispatch);
if (AXIS2_FAILURE == status)
{
@@ -1259,7 +1259,7 @@
handler = axis2_disp_checker_get_base(disp_checker, env);
axis2_phase_add_handler_at(post_dispatch, env, 0, handler);
- status = axis2_array_list_add(conf->
+ status = axutil_array_list_add(conf->
in_phases_upto_and_including_post_dispatch, env, post_dispatch);
if (AXIS2_FAILURE == status)
{
@@ -1337,13 +1337,13 @@
int i = 0;
const axis2_qname_t *module_qname = NULL;
- size = axis2_array_list_size(conf->engaged_modules, env);
+ size = axutil_array_list_size(conf->engaged_modules, env);
module_qname = axis2_module_desc_get_qname(module_desc, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
- qname = (axis2_qname_t *) axis2_array_list_get(conf->
+ qname = (axis2_qname_t *) axutil_array_list_get(conf->
engaged_modules, env, i);
if (AXIS2_TRUE == axis2_qname_equals(module_qname, env, qname))
{
@@ -1377,7 +1377,7 @@
}
module_qname = axis2_module_desc_get_qname(module_desc, env);
module_qref_l = axis2_qname_clone((axis2_qname_t *)module_qname, env);
- status = axis2_array_list_add(conf->engaged_modules, env,
+ status = axutil_array_list_add(conf->engaged_modules, env,
module_qref_l);
}
if (is_new_module)
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Fri Mar 30 06:19:43 2007
@@ -79,7 +79,7 @@
{
axis2_status_t status = AXIS2_SUCCESS;
axis2_op_ctx_t *op_ctx = NULL;
- axis2_array_list_t *phases = NULL;
+ axutil_array_list_t *phases = NULL;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
@@ -117,7 +117,7 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- axis2_array_list_t *global_out_phase = axis2_conf_get_out_phases(conf, env);
+ axutil_array_list_t *global_out_phase = axis2_conf_get_out_phases(conf, env);
if (global_out_phase)
{
axis2_engine_invoke_phases(engine, env, global_out_phase, msg_ctx);
@@ -140,7 +140,7 @@
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- axis2_array_list_t *global_out_phase = axis2_conf_get_out_phases(conf, env);
+ axutil_array_list_t *global_out_phase = axis2_conf_get_out_phases(conf, env);
if (global_out_phase)
{
axis2_engine_invoke_phases(engine, env, global_out_phase, msg_ctx);
@@ -191,8 +191,8 @@
axis2_conf_t *conf = NULL;
axis2_op_ctx_t *op_ctx = NULL;
axis2_op_t *op = NULL;
- axis2_array_list_t *pre_calculated_phases = NULL;
- axis2_array_list_t *op_specific_phases = NULL;
+ axutil_array_list_t *pre_calculated_phases = NULL;
+ axutil_array_list_t *op_specific_phases = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -319,7 +319,7 @@
axis2_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- axis2_array_list_t *phases =
+ axutil_array_list_t *phases =
axis2_conf_get_out_fault_flow(conf, env);
if (phases)
{
@@ -368,7 +368,7 @@
axis2_conf_t *conf = axis2_conf_ctx_get_conf(conf_ctx, env);
if (conf)
{
- axis2_array_list_t *phases =
+ axutil_array_list_t *phases =
axis2_conf_get_in_phases_upto_and_including_post_dispatch(conf, env);
if (phases)
{
@@ -391,7 +391,7 @@
if (op_ctx)
{
axis2_op_t *op = axis2_op_ctx_get_op(op_ctx, env);
- axis2_array_list_t *phases = axis2_op_get_fault_in_flow(op, env);
+ axutil_array_list_t *phases = axis2_op_get_fault_in_flow(op, env);
if ( axis2_msg_ctx_is_paused(msg_ctx, env))
{
axis2_engine_resume_invocation_phases(engine, env, phases, msg_ctx);
@@ -555,7 +555,7 @@
axis2_engine_invoke_phases(
axis2_engine_t *engine,
const axis2_env_t *env,
- axis2_array_list_t *phases,
+ axutil_array_list_t *phases,
axis2_msg_ctx_t *msg_ctx)
{
int i = 0;
@@ -567,11 +567,11 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
if (phases)
- count = axis2_array_list_size(phases, env);
+ count = axutil_array_list_size(phases, env);
for (i = 0; (i < count && !( axis2_msg_ctx_is_paused(msg_ctx, env))); i++)
{
axis2_phase_t *phase = (axis2_phase_t *)
- axis2_array_list_get(phases, env, i);
+ axutil_array_list_get(phases, env, i);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"Invoking phase %s", axis2_phase_get_name(phase, env));
@@ -590,7 +590,7 @@
axis2_engine_resume_invocation_phases(
axis2_engine_t *engine,
const axis2_env_t *env,
- axis2_array_list_t *phases,
+ axutil_array_list_t *phases,
axis2_msg_ctx_t *msg_ctx)
{
int i = 0;
@@ -603,11 +603,11 @@
axis2_msg_ctx_set_paused(msg_ctx, env, AXIS2_FALSE);
- count = axis2_array_list_size(phases, env);
+ count = axutil_array_list_size(phases, env);
for (i = 0; i < count && !( axis2_msg_ctx_is_paused(msg_ctx, env)); i++)
{
- axis2_phase_t *phase = (axis2_phase_t *) axis2_array_list_get(phases,
+ axis2_phase_t *phase = (axis2_phase_t *) axutil_array_list_get(phases,
env, i);
const axis2_char_t *phase_name = axis2_phase_get_name(phase, env);
const axis2_char_t *paused_phase_name =
@@ -753,7 +753,7 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
- axis2_array_list_t *phases = NULL;
+ axutil_array_list_t *phases = NULL;
/* find and invoke the phases */
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
@@ -805,7 +805,7 @@
axis2_msg_ctx_t *msg_ctx)
{
axis2_op_ctx_t *op_ctx = NULL;
- axis2_array_list_t *phases = NULL;
+ axutil_array_list_t *phases = NULL;
axis2_status_t status = AXIS2_FAILURE;
/* invoke the phases */
Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Fri Mar 30 06:19:43 2007
@@ -18,14 +18,14 @@
#include <axis2_string.h>
#include <axis2_phase.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_msg_ctx.h>
#include <axis2_const.h>
static axis2_status_t
axis2_phase_add_unique(
const axis2_env_t *env,
- axis2_array_list_t *list,
+ axutil_array_list_t *list,
axis2_handler_t *handler);
struct axis2_phase
@@ -33,7 +33,7 @@
/** phase name */
axis2_char_t *name;
/** array list of handlers */
- axis2_array_list_t* handlers;
+ axutil_array_list_t* handlers;
/** first handler of phase */
axis2_handler_t *first_handler;
/** first handler of phase set? */
@@ -73,7 +73,7 @@
phase->last_handler_set = AXIS2_FALSE;
phase->is_one_handler = AXIS2_FALSE;
- phase->handlers = axis2_array_list_create(env, 10);
+ phase->handlers = axutil_array_list_create(env, 10);
if (!(phase->handlers))
{
/** error is already set by last method array list container create */
@@ -110,7 +110,7 @@
index,
phase->name);
- return axis2_array_list_add_at(phase->handlers, env, index, handler);
+ return axutil_array_list_add_at(phase->handlers, env, index, handler);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -158,7 +158,7 @@
}
}
/* Invoking the rest of handlers except first_handler and last_handler */
- size = axis2_array_list_size(phase->handlers, env);
+ size = axutil_array_list_size(phase->handlers, env);
while (index < size)
{
if ( axis2_msg_ctx_is_paused(msg_ctx, env))
@@ -168,7 +168,7 @@
else
{
axis2_handler_t *handler = (axis2_handler_t*)
- axis2_array_list_get(phase->handlers, env, index);
+ axutil_array_list_get(phase->handlers, env, index);
if (handler)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
@@ -223,7 +223,7 @@
const axis2_phase_t *phase,
const axis2_env_t *env)
{
- return axis2_array_list_size(phase->handlers, env);
+ return axutil_array_list_size(phase->handlers, env);
}
@@ -364,7 +364,7 @@
if (first && last)
{
- if (axis2_array_list_size(phase->handlers, env) > 0)
+ if (axutil_array_list_size(phase->handlers, env) > 0)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_RULES, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -377,7 +377,7 @@
return AXIS2_FAILURE;
}
- /*status = axis2_array_list_add(phase->handlers, env, handler);*/
+ /*status = axutil_array_list_add(phase->handlers, env, handler);*/
status = axis2_phase_add_unique(env, phase->handlers, handler);
if (status == AXIS2_SUCCESS)
phase->is_one_handler = AXIS2_TRUE;
@@ -558,16 +558,16 @@
if (axis2_strcmp(before, handler_name) == 0)
{
- /*return axis2_array_list_add(phase->handlers, env, handler);*/
+ /*return axutil_array_list_add(phase->handlers, env, handler);*/
return axis2_phase_add_unique(env, phase->handlers, handler);
}
}
- size = axis2_array_list_size(phase->handlers, env);
+ size = axutil_array_list_size(phase->handlers, env);
for (i = 0; i < size; i++)
{
- axis2_handler_t *temp_handler = (axis2_handler_t *) axis2_array_list_get(phase->handlers, env, i);
+ axis2_handler_t *temp_handler = (axis2_handler_t *) axutil_array_list_get(phase->handlers, env, i);
if (temp_handler)
{
handler_desc = AXIS2_HANDLER_GET_HANDLER_DESC(temp_handler, env);
@@ -586,12 +586,12 @@
if (axis2_strcmp(before, handler_name) == 0)
{
- return axis2_array_list_add_at(phase->handlers, env, i, handler);
+ return axutil_array_list_add_at(phase->handlers, env, i, handler);
}
}
}
/* add as the last handler */
- /* return axis2_array_list_add(phase->handlers, env, handler); */
+ /* return axutil_array_list_add(phase->handlers, env, handler); */
return axis2_phase_add_unique(env, phase->handlers, handler);
}
@@ -649,15 +649,15 @@
if (axis2_strcmp(after, handler_name) == 0)
{
- return axis2_array_list_add_at(phase->handlers, env, 0, handler);
+ return axutil_array_list_add_at(phase->handlers, env, 0, handler);
}
}
- size = axis2_array_list_size(phase->handlers, env);
+ size = axutil_array_list_size(phase->handlers, env);
for (i = 0; i < size; i++)
{
- axis2_handler_t *temp_handler = (axis2_handler_t *) axis2_array_list_get(phase->handlers, env, i);
+ axis2_handler_t *temp_handler = (axis2_handler_t *) axutil_array_list_get(phase->handlers, env, i);
if (temp_handler)
{
handler_desc = AXIS2_HANDLER_GET_HANDLER_DESC(temp_handler, env);
@@ -681,13 +681,13 @@
return axis2_phase_add_unique(env, phase->handlers, handler);
}
else
- return axis2_array_list_add_at(phase->handlers, env, i + 1, handler);
+ return axutil_array_list_add_at(phase->handlers, env, i + 1, handler);
}
}
}
if (size > 0)
- return axis2_array_list_add_at(phase->handlers, env, 0, handler);
+ return axutil_array_list_add_at(phase->handlers, env, 0, handler);
else
{
return axis2_phase_add_unique(env, phase->handlers, handler);
@@ -788,7 +788,7 @@
after = 0;
}
- size = axis2_array_list_size(phase->handlers, env);
+ size = axutil_array_list_size(phase->handlers, env);
if (after_handler_name)
{
@@ -798,7 +798,7 @@
for (i = 0; i < size; i++)
{
- axis2_handler_t *temp_handler = (axis2_handler_t *) axis2_array_list_get(phase->handlers, env, i);
+ axis2_handler_t *temp_handler = (axis2_handler_t *) axutil_array_list_get(phase->handlers, env, i);
if (temp_handler)
{
handler_desc = AXIS2_HANDLER_GET_HANDLER_DESC(temp_handler, env);
@@ -833,7 +833,7 @@
{
if (after + 1 < size)
{
- return axis2_array_list_add_at(phase->handlers, env, after + 1, handler);
+ return axutil_array_list_add_at(phase->handlers, env, after + 1, handler);
}
else
{
@@ -902,7 +902,7 @@
return status;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phase_get_all_handlers(
const axis2_phase_t *phase,
const axis2_env_t *env)
@@ -924,10 +924,10 @@
axis2_msg_ctx_set_paused_phase_name(msg_ctx, env, phase->name);
- size = axis2_array_list_size(phase->handlers, env);
+ size = axutil_array_list_size(phase->handlers, env);
for (i = paused_handler_index; i < size; i++)
{
- axis2_handler_t *handler = (axis2_handler_t *) axis2_array_list_get(
+ axis2_handler_t *handler = (axis2_handler_t *) axutil_array_list_get(
phase->handlers, env, i);
if (handler)
{
@@ -962,7 +962,7 @@
if (phase->handlers)
{
- axis2_array_list_free(phase->handlers, env);
+ axutil_array_list_free(phase->handlers, env);
}
AXIS2_FREE(env->allocator, phase);
return;
@@ -971,7 +971,7 @@
static axis2_status_t
axis2_phase_add_unique(
const axis2_env_t *env,
- axis2_array_list_t *list,
+ axutil_array_list_t *list,
axis2_handler_t *handler)
{
int i = 0, size = 0;
@@ -979,13 +979,13 @@
const axis2_string_t *handler_name = NULL;
handler_name = AXIS2_HANDLER_GET_NAME(handler, env);
- size = axis2_array_list_size(list, env);
+ size = axutil_array_list_size(list, env);
for (i = 0; i < size; i++)
{
axis2_handler_t *obj = NULL;
const axis2_string_t *obj_name = NULL;
- obj = (axis2_handler_t *) axis2_array_list_get(list, env, i);
+ obj = (axis2_handler_t *) axutil_array_list_get(list, env, i);
obj_name = AXIS2_HANDLER_GET_NAME(obj, env);
if (obj == handler)
{
@@ -1000,7 +1000,7 @@
}
}
if (AXIS2_TRUE == add_handler)
- axis2_array_list_add(list, env, handler);
+ axutil_array_list_add(list, env, handler);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Fri Mar 30 06:19:43 2007
@@ -19,7 +19,7 @@
struct axis2_phase_holder
{
- axis2_array_list_t *phase_list;
+ axutil_array_list_t *phase_list;
};
AXIS2_EXTERN axis2_phase_holder_t *AXIS2_CALL
@@ -45,7 +45,7 @@
AXIS2_EXTERN axis2_phase_holder_t *AXIS2_CALL
axis2_phase_holder_create_with_phases(const axis2_env_t *env,
- axis2_array_list_t *phases)
+ axutil_array_list_t *phases)
{
axis2_phase_holder_t *phase_holder = NULL;
@@ -88,13 +88,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, phase_name, AXIS2_FALSE);
- size = axis2_array_list_size(phase_holder->phase_list, env);
+ size = axutil_array_list_size(phase_holder->phase_list, env);
for (i = 0; i < size; i++)
{
const axis2_char_t *phase_name_l = NULL;
- phase = (axis2_phase_t *) axis2_array_list_get(phase_holder->
+ phase = (axis2_phase_t *) axutil_array_list_get(phase_holder->
phase_list, env, i);
phase_name_l = axis2_phase_get_name(phase, env);
if (0 == axis2_strcmp(phase_name_l, phase_name))
@@ -151,12 +151,12 @@
AXIS2_PARAM_CHECK(env->error, phase_name, NULL);
- size = axis2_array_list_size(phase_holder->phase_list, env);
+ size = axutil_array_list_size(phase_holder->phase_list, env);
for (i = 0; i < size; i++)
{
const axis2_char_t *phase_name_l = NULL;
- phase = (axis2_phase_t *) axis2_array_list_get(phase_holder->
+ phase = (axis2_phase_t *) axutil_array_list_get(phase_holder->
phase_list, env, i);
phase_name_l = axis2_phase_get_name(phase, env);
if (0 == axis2_strcmp(phase_name_l, phase_name))
@@ -172,7 +172,7 @@
axis2_phase_holder_build_transport_handler_chain(axis2_phase_holder_t *phase_holder,
const axis2_env_t *env,
axis2_phase_t *phase,
- axis2_array_list_t *handlers)
+ axutil_array_list_t *handlers)
{
axis2_handler_t *handler = NULL;
int size = 0;
@@ -184,11 +184,11 @@
AXIS2_PARAM_CHECK(env->error, phase, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, handlers, AXIS2_FAILURE);
- size = axis2_array_list_size(handlers, env);
+ size = axutil_array_list_size(handlers, env);
for (i = 0; i < size; i++)
{
- handler_desc = (axis2_handler_desc_t *) axis2_array_list_get(
+ handler_desc = (axis2_handler_desc_t *) axutil_array_list_get(
handlers, env, i);
status = AXIS2_HANDLER_INIT(handler, env, handler_desc);
if (AXIS2_FAILURE == status)
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Fri Mar 30 06:19:43 2007
@@ -201,8 +201,8 @@
int type,
axis2_op_t *op)
{
- axis2_array_list_t *all_handlers = NULL;
- axis2_array_list_t *moduleqnames = NULL;
+ axutil_array_list_t *all_handlers = NULL;
+ axutil_array_list_t *moduleqnames = NULL;
int i = 0;
int size = 0;
int status = AXIS2_FAILURE;
@@ -214,7 +214,7 @@
moduleqnames = axis2_conf_get_all_engaged_modules(
phase_resolver->axis2_config, env);
- size = axis2_array_list_size(moduleqnames, env);
+ size = axutil_array_list_size(moduleqnames, env);
status = AXIS2_ERROR_GET_STATUS_CODE(env->error);
if (AXIS2_SUCCESS != status)
{
@@ -226,7 +226,7 @@
axis2_qname_t *modulename = NULL;
axis2_module_desc_t *module_desc = NULL;
- modulename = (axis2_qname_t *) axis2_array_list_get(moduleqnames, env,
+ modulename = (axis2_qname_t *) axutil_array_list_get(moduleqnames, env,
i);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "module name is:%s",
axis2_qname_get_localpart(modulename, env));
@@ -302,18 +302,18 @@
{
if (!all_handlers)
{
- all_handlers = axis2_array_list_create(env, 0);
+ all_handlers = axutil_array_list_create(env, 0);
if (!all_handlers)
{
return AXIS2_FAILURE;
}
}
- status = axis2_array_list_add(all_handlers, env, metadata);
+ status = axutil_array_list_add(all_handlers, env, metadata);
if (AXIS2_SUCCESS != status)
{
if (all_handlers)
{
- axis2_array_list_free(all_handlers, env);
+ axutil_array_list_free(all_handlers, env);
all_handlers = NULL;
}
return status;
@@ -345,7 +345,7 @@
{
if (all_handlers)
{
- axis2_array_list_free(all_handlers, env);
+ axutil_array_list_free(all_handlers, env);
all_handlers = NULL;
}
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
@@ -378,7 +378,7 @@
{
if (all_handlers)
{
- axis2_array_list_free(all_handlers, env);
+ axutil_array_list_free(all_handlers, env);
all_handlers = NULL;
}
AXIS2_ERROR_SET(env->error,
@@ -390,14 +390,14 @@
{
if (!all_handlers)
{
- all_handlers = axis2_array_list_create(env, 0);
+ all_handlers = axutil_array_list_create(env, 0);
if (!all_handlers)
{
return AXIS2_FAILURE;
}
}
- status = axis2_array_list_add(all_handlers, env, metadata);
+ status = axutil_array_list_add(all_handlers, env, metadata);
if (AXIS2_SUCCESS != status)
{
@@ -405,16 +405,16 @@
{
int size = 0;
int i = 0;
- size = axis2_array_list_size(all_handlers, env);
+ size = axutil_array_list_size(all_handlers, env);
for (i = 0; i < size; i++)
{
axis2_handler_desc_t *handler_desc = NULL;
- handler_desc = axis2_array_list_get(all_handlers,
+ handler_desc = axutil_array_list_get(all_handlers,
env, i);
axis2_handler_desc_free(handler_desc, env);
}
- axis2_array_list_free(all_handlers, env);
+ axutil_array_list_free(all_handlers, env);
all_handlers = NULL;
}
return status;
@@ -433,7 +433,7 @@
{
case AXIS2_IN_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_op_get_in_flow(op, env);
phase_holder =
@@ -442,7 +442,7 @@
}
case AXIS2_OUT_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_op_get_out_flow(op, env);
phase_holder =
@@ -451,7 +451,7 @@
}
case AXIS2_FAULT_IN_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_op_get_fault_in_flow(op, env);
phase_holder =
@@ -460,7 +460,7 @@
}
case AXIS2_FAULT_OUT_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_op_get_fault_out_flow(op, env);
phase_holder =
@@ -469,7 +469,7 @@
}
}
- size = axis2_array_list_size(all_handlers, env);
+ size = axutil_array_list_size(all_handlers, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
@@ -480,7 +480,7 @@
axis2_handler_desc_t *metadata = NULL;
metadata = (axis2_handler_desc_t *)
- axis2_array_list_get(all_handlers, env, i);
+ axutil_array_list_get(all_handlers, env, i);
if (phase_holder)
{
status = axis2_phase_holder_add_handler(phase_holder,
@@ -495,7 +495,7 @@
/* Free the locally created all_handlers list */
if (all_handlers)
{
- axis2_array_list_free(all_handlers, env);
+ axutil_array_list_free(all_handlers, env);
}
if(phase_holder)
{
@@ -578,7 +578,7 @@
int type = 0;
int j = 0;
axis2_status_t status = AXIS2_FAILURE;
- axis2_array_list_t *handlers = NULL;
+ axutil_array_list_t *handlers = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, transport, AXIS2_FAILURE);
@@ -609,7 +609,7 @@
int size = 0;
size = axis2_flow_get_handler_count(flow, env);
- handlers = axis2_array_list_create(env, 0);
+ handlers = axutil_array_list_create(env, 0);
for (j = 0; j < size; j++)
{
axis2_handler_desc_t *metadata = NULL;
@@ -630,17 +630,17 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(handlers, env);
+ size = axutil_array_list_size(handlers, env);
for (i = 0; i < size; i++)
{
- handler_d = axis2_array_list_get(handlers, env, i);
+ handler_d = axutil_array_list_get(handlers, env, i);
axis2_handler_desc_free(handler_d, env);
}
- axis2_array_list_free(handlers, env);
+ axutil_array_list_free(handlers, env);
}
return status;
}
- status = axis2_array_list_add(handlers, env, metadata);
+ status = axutil_array_list_add(handlers, env, metadata);
if (AXIS2_SUCCESS != status)
{
if (handlers)
@@ -649,13 +649,13 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(handlers, env);
+ size = axutil_array_list_size(handlers, env);
for (i = 0; i < size; i++)
{
- handler_d = axis2_array_list_get(handlers, env, i);
+ handler_d = axutil_array_list_get(handlers, env, i);
axis2_handler_desc_free(handler_d, env);
}
- axis2_array_list_free(handlers, env);
+ axutil_array_list_free(handlers, env);
}
return status;
}
@@ -669,13 +669,13 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(handlers, env);
+ size = axutil_array_list_size(handlers, env);
for (i = 0; i < size; i++)
{
- handler_d = axis2_array_list_get(handlers, env, i);
+ handler_d = axutil_array_list_get(handlers, env, i);
axis2_handler_desc_free(handler_d, env);
}
- axis2_array_list_free(handlers, env);
+ axutil_array_list_free(handlers, env);
}
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
@@ -696,7 +696,7 @@
}
if (handlers)
{
- axis2_array_list_free(handlers, env);
+ axutil_array_list_free(handlers, env);
}
return status;
}
@@ -709,7 +709,7 @@
{
int type = 0;
axis2_status_t status = AXIS2_FAILURE;
- axis2_array_list_t *handlers = NULL;
+ axutil_array_list_t *handlers = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, transport, AXIS2_FAILURE);
@@ -744,7 +744,7 @@
{
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
}
- handlers = axis2_array_list_create(env, 0);
+ handlers = axutil_array_list_create(env, 0);
for (j = 0; j < hndlr_count; j++)
{
@@ -768,18 +768,18 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(handlers, env);
+ size = axutil_array_list_size(handlers, env);
for (i = 0; i < size; i++)
{
- handler_d = axis2_array_list_get(handlers, env, i);
+ handler_d = axutil_array_list_get(handlers, env, i);
axis2_handler_desc_free(handler_d, env);
}
- axis2_array_list_free(handlers, env);
+ axutil_array_list_free(handlers, env);
}
return status;
}
- status = axis2_array_list_add(handlers, env, metadata);
+ status = axutil_array_list_add(handlers, env, metadata);
if (AXIS2_FAILURE == status)
{
if (handlers)
@@ -788,13 +788,13 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(handlers, env);
+ size = axutil_array_list_size(handlers, env);
for (i = 0; i < size; i++)
{
- handler_d = axis2_array_list_get(handlers, env, i);
+ handler_d = axutil_array_list_get(handlers, env, i);
axis2_handler_desc_free(handler_d, env);
}
- axis2_array_list_free(handlers, env);
+ axutil_array_list_free(handlers, env);
}
return status;
}
@@ -808,13 +808,13 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(handlers, env);
+ size = axutil_array_list_size(handlers, env);
for (i = 0; i < size; i++)
{
- handler_d = axis2_array_list_get(handlers, env, i);
+ handler_d = axutil_array_list_get(handlers, env, i);
axis2_handler_desc_free(handler_d, env);
}
- axis2_array_list_free(handlers, env);
+ axutil_array_list_free(handlers, env);
}
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -834,7 +834,7 @@
}
if (handlers)
{
- axis2_array_list_free(handlers, env);
+ axutil_array_list_free(handlers, env);
}
return status;
}
@@ -944,7 +944,7 @@
void *v = NULL;
axis2_op_t *op_desc = NULL;
int j = 0;
- axis2_array_list_t *modules = NULL;
+ axutil_array_list_t *modules = NULL;
axis2_flow_t *flow = NULL;
const axis2_qname_t *module_desc_qname = NULL;
int size = 0;
@@ -957,7 +957,7 @@
module_desc_qname = axis2_module_desc_get_qname(module_desc, env);
if (modules)
{
- size = axis2_array_list_size(modules, env);
+ size = axutil_array_list_size(modules, env);
}
for (j = 0; j < size; j++)
{
@@ -965,7 +965,7 @@
const axis2_qname_t *module_desc_qname_l = NULL;
module_desc_l = (axis2_module_desc_t *)
- axis2_array_list_get(modules, env, j);
+ axutil_array_list_get(modules, env, j);
module_desc_qname_l = axis2_module_desc_get_qname(module_desc_l ,
env);
@@ -987,7 +987,7 @@
{
case AXIS2_IN_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_op_get_in_flow(op_desc, env);
phase_holder =
@@ -996,7 +996,7 @@
}
case AXIS2_OUT_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_op_get_out_flow(op_desc, env);
phase_holder =
@@ -1005,7 +1005,7 @@
}
case AXIS2_FAULT_IN_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_op_get_fault_in_flow(op_desc, env);
phase_holder =
@@ -1014,7 +1014,7 @@
}
case AXIS2_FAULT_OUT_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_op_get_fault_out_flow(op_desc, env);
phase_holder =
@@ -1124,7 +1124,7 @@
{
case AXIS2_IN_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list =
axis2_conf_get_in_phases_upto_and_including_post_dispatch(
@@ -1136,7 +1136,7 @@
}
case AXIS2_OUT_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_conf_get_out_flow(phase_resolver->axis2_config,
env);
@@ -1147,7 +1147,7 @@
}
case AXIS2_FAULT_IN_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_conf_get_in_fault_flow(phase_resolver->
axis2_config, env);
@@ -1158,7 +1158,7 @@
}
case AXIS2_FAULT_OUT_FLOW:
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_list = axis2_conf_get_out_fault_flow(phase_resolver->
axis2_config, env);
@@ -1270,7 +1270,7 @@
for (index_i = axis2_hash_first(ops, env); index_i; index_i =
axis2_hash_next(env, index_i))
{
- axis2_array_list_t *modules = NULL;
+ axutil_array_list_t *modules = NULL;
axis2_op_t *op_desc = NULL;
int size = 0;
int j = 0;
@@ -1282,14 +1282,14 @@
modules = axis2_op_get_all_modules(op_desc, env);
if (modules)
{
- size = axis2_array_list_size(modules, env);
+ size = axutil_array_list_size(modules, env);
}
for (j = 0; j < size; j++)
{
axis2_module_desc_t *module_desc_l = NULL;
const axis2_qname_t *module_d_qname_l = NULL;
- module_desc_l = axis2_array_list_get(modules, env, j);
+ module_desc_l = axutil_array_list_get(modules, env, j);
module_d_qname_l = axis2_module_desc_get_qname(module_desc_l, env);
if (AXIS2_TRUE == axis2_qname_equals(module_d_qname, env,
module_d_qname_l))
@@ -1338,7 +1338,7 @@
for (type = 1; type < 5; type++)
{
axis2_flow_t *flow = NULL;
- axis2_array_list_t *phases = NULL;
+ axutil_array_list_t *phases = NULL;
switch (type)
{
@@ -1432,7 +1432,7 @@
(0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name)) ||
(0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name)))
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
axis2_phase_holder_t *phase_holder = NULL;
phase_list =
Modified: webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c Fri Mar 30 06:19:43 2007
@@ -146,7 +146,7 @@
local_name = axiom_element_get_localname(op_element, env);
if (local_name)
{
- axis2_array_list_t *function_arr = NULL;
+ axutil_array_list_t *function_arr = NULL;
int i = 0;
int size = 0;
axis2_bool_t matches = AXIS2_FALSE;
@@ -154,14 +154,14 @@
function_arr = svc_obj->func_array;
if (function_arr)
{
- size = axis2_array_list_size(function_arr, env);
+ size = axutil_array_list_size(function_arr, env);
}
for (i = 0; i < size; i++)
{
axis2_char_t *function_name = NULL;
- function_name = (axis2_char_t *) axis2_array_list_get(
+ function_name = (axis2_char_t *) axutil_array_list_get(
function_arr, env, i);
if (0 == axis2_strcmp(function_name, local_name))
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c Fri Mar 30 06:19:43 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_http_simple_request.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_http_transport.h>
#include <axis2_string.h>
#include <string.h>
@@ -25,7 +25,7 @@
struct axis2_http_simple_request
{
axis2_http_request_line_t *request_line;
- axis2_array_list_t *header_group;
+ axutil_array_list_t *header_group;
axis2_stream_t *stream;
axis2_bool_t owns_stream;
};
@@ -72,12 +72,12 @@
if (http_hdr_count > 0 && http_headers)
{
int i = 0;
- simple_request->header_group = axis2_array_list_create(env,
+ simple_request->header_group = axutil_array_list_create(env,
http_hdr_count);
for (i = 0; i < http_hdr_count; i++)
{
- axis2_array_list_add(simple_request->header_group, env,
+ axutil_array_list_add(simple_request->header_group, env,
(void *)http_headers[i]);
}
}
@@ -107,15 +107,15 @@
{
int i = 0;
axis2_http_header_t *tmp = NULL;
- for (i = 0; i < axis2_array_list_size(simple_request->header_group,
+ for (i = 0; i < axutil_array_list_size(simple_request->header_group,
env); i++)
{
- tmp = (axis2_http_header_t *)axis2_array_list_get(
+ tmp = (axis2_http_header_t *)axutil_array_list_get(
simple_request->header_group, env, i);
AXIS2_HTTP_HEADER_FREE(tmp, env);
}
- axis2_array_list_free(simple_request->header_group, env);
+ axutil_array_list_free(simple_request->header_group, env);
}
AXIS2_FREE(env->allocator, simple_request);
@@ -163,7 +163,7 @@
return AXIS2_FALSE;
}
- count = axis2_array_list_size(simple_request->header_group, env);
+ count = axutil_array_list_size(simple_request->header_group, env);
if (0 == count)
{
@@ -173,7 +173,7 @@
for (i = 0; i < count; i++)
{
header_name = AXIS2_HTTP_HEADER_GET_NAME((axis2_http_header_t *)
- axis2_array_list_get(simple_request->header_group,
+ axutil_array_list_get(simple_request->header_group,
env, i), env);
if (0 == axis2_strcasecmp(name, header_name))
return AXIS2_TRUE;
@@ -182,7 +182,7 @@
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_http_simple_request_get_headers(
const axis2_http_simple_request_t *simple_request,
const axis2_env_t *env)
@@ -197,7 +197,7 @@
const axis2_env_t *env,
const axis2_char_t *str)
{
- axis2_array_list_t *header_group = NULL;
+ axutil_array_list_t *header_group = NULL;
int i = 0;
int count = 0;
axis2_http_header_t *tmp_header = NULL;
@@ -211,19 +211,19 @@
{
return NULL;
}
- if (0 == axis2_array_list_size(header_group, env))
+ if (0 == axutil_array_list_size(header_group, env))
{
return NULL;
}
- count = axis2_array_list_size(header_group, env);
+ count = axutil_array_list_size(header_group, env);
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
+ tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
if (0 == axis2_strcasecmp(str, tmp_name))
@@ -245,7 +245,7 @@
axis2_char_t *tmp_name = NULL;
int i = 0;
int count = 0;
- axis2_array_list_t *header_group = NULL;
+ axutil_array_list_t *header_group = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FAILURE);
@@ -261,17 +261,17 @@
return AXIS2_SUCCESS;
}
- count = axis2_array_list_size(header_group, env);
+ count = axutil_array_list_size(header_group, env);
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
+ tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
if (0 == axis2_strcasecmp(str, tmp_name))
{
AXIS2_HTTP_HEADER_FREE(tmp_header, env);
- axis2_array_list_remove(header_group, env, i);
+ axutil_array_list_remove(header_group, env, i);
break;
}
}
@@ -290,9 +290,9 @@
if (! simple_request->header_group)
{
- simple_request->header_group = axis2_array_list_create(env, 1);
+ simple_request->header_group = axutil_array_list_create(env, 1);
}
- return axis2_array_list_add(simple_request->header_group,
+ return axutil_array_list_add(simple_request->header_group,
env, header);
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c Fri Mar 30 06:19:43 2007
@@ -26,7 +26,7 @@
struct axis2_http_simple_response
{
axis2_http_status_line_t *status_line;
- axis2_array_list_t *header_group;
+ axutil_array_list_t *header_group;
axis2_stream_t *stream;
};
@@ -59,12 +59,12 @@
if (http_hdr_count > 0 && http_headers)
{
int i = 0;
- simple_response->header_group = axis2_array_list_create(env,
+ simple_response->header_group = axutil_array_list_create(env,
http_hdr_count);
for (i = 0; i < http_hdr_count; i++)
{
- axis2_array_list_add(simple_response->header_group, env,
+ axutil_array_list_add(simple_response->header_group, env,
(void *)http_headers[i]);
}
}
@@ -107,17 +107,17 @@
{
int i = 0;
axis2_http_header_t *tmp = NULL;
- for (i = 0; i < axis2_array_list_size(simple_response->header_group,
+ for (i = 0; i < axutil_array_list_size(simple_response->header_group,
env); i++)
{
- tmp = (axis2_http_header_t *)axis2_array_list_get(
+ tmp = (axis2_http_header_t *)axutil_array_list_get(
simple_response->header_group, env, i);
if (tmp)
{
AXIS2_HTTP_HEADER_FREE(tmp, env);
}
}
- axis2_array_list_free(simple_response->header_group, env);
+ axutil_array_list_free(simple_response->header_group, env);
}
AXIS2_FREE(env->allocator, simple_response);
@@ -216,7 +216,7 @@
return AXIS2_HTTP_STATUS_LINE_TO_STRING(simple_response->status_line, env);
}
-axis2_array_list_t *AXIS2_CALL
+axutil_array_list_t *AXIS2_CALL
axis2_http_simple_response_get_headers(
axis2_http_simple_response_t *simple_response,
const axis2_env_t *env)
@@ -234,7 +234,7 @@
axis2_char_t *tmp_name = NULL;
int i = 0;
int count = 0;
- axis2_array_list_t *header_group = NULL;
+ axutil_array_list_t *header_group = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, str, NULL);
@@ -244,16 +244,16 @@
{
return NULL;
}
- if (0 == axis2_array_list_size(header_group, env))
+ if (0 == axutil_array_list_size(header_group, env))
{
return NULL;
}
- count = axis2_array_list_size(header_group, env);
+ count = axutil_array_list_size(header_group, env);
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
+ tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
if (0 == axis2_strcasecmp(str, tmp_name))
@@ -272,7 +272,7 @@
const axis2_env_t *env,
const axis2_char_t *str)
{
- axis2_array_list_t *header_group = NULL;
+ axutil_array_list_t *header_group = NULL;
axis2_http_header_t *tmp_header = NULL;
axis2_char_t *tmp_name = NULL;
int i = 0;
@@ -291,18 +291,18 @@
return AXIS2_SUCCESS;
}
- count = axis2_array_list_size(header_group, env);
+ count = axutil_array_list_size(header_group, env);
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
+ tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
if (0 == axis2_strcasecmp(str, tmp_name))
{
AXIS2_HTTP_HEADER_FREE(tmp_header, env);
- axis2_array_list_remove(header_group, env, i);
+ axutil_array_list_remove(header_group, env, i);
break;
}
}
@@ -319,15 +319,15 @@
int count = 0;
axis2_http_header_t *tmp_header = NULL;
axis2_char_t *tmp_name = NULL;
- axis2_array_list_t *header_group = NULL;
+ axutil_array_list_t *header_group = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, header, AXIS2_FAILURE);
if (! simple_response->header_group)
{
- simple_response->header_group = axis2_array_list_create(env, 10);
- axis2_array_list_add(simple_response->header_group, env, header);
+ simple_response->header_group = axutil_array_list_create(env, 10);
+ axutil_array_list_add(simple_response->header_group, env, header);
return AXIS2_SUCCESS;
}
@@ -336,21 +336,21 @@
*/
header_group = simple_response->header_group;
- count = axis2_array_list_size(header_group, env);
+ count = axutil_array_list_size(header_group, env);
for (i = 0; i < count; i++)
{
- tmp_header = (axis2_http_header_t *)axis2_array_list_get(header_group,
+ tmp_header = (axis2_http_header_t *)axutil_array_list_get(header_group,
env, i);
tmp_name = AXIS2_HTTP_HEADER_GET_NAME(tmp_header, env);
if (0 == axis2_strcasecmp(AXIS2_HTTP_HEADER_GET_NAME(header, env),
tmp_name))
{
AXIS2_HTTP_HEADER_FREE(tmp_header, env);
- axis2_array_list_remove(header_group, env, i);
+ axutil_array_list_remove(header_group, env, i);
break;
}
}
- axis2_array_list_add(simple_response->header_group, env,
+ axutil_array_list_add(simple_response->header_group, env,
(void *)header);
return AXIS2_SUCCESS;
}
@@ -525,7 +525,7 @@
{
return AXIS2_FALSE;
}
- count = axis2_array_list_size(simple_response->header_group, env);
+ count = axutil_array_list_size(simple_response->header_group, env);
if (0 == count)
{
return AXIS2_FALSE;
@@ -534,7 +534,7 @@
for (i = 0; i < count; i++)
{
header_name = AXIS2_HTTP_HEADER_GET_NAME((axis2_http_header_t *)
- axis2_array_list_get(simple_response->header_group,
+ axutil_array_list_get(simple_response->header_group,
env, i), env);
if (0 == axis2_strcasecmp(name, header_name))
return AXIS2_TRUE;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c Fri Mar 30 06:19:43 2007
@@ -533,7 +533,7 @@
const axis2_env_t *env,
axis2_http_simple_request_t *request)
{
- axis2_array_list_t *header_list = NULL;
+ axutil_array_list_t *header_list = NULL;
int hdr_count = 0;
int i = 0;
axis2_hash_t *header_map = NULL;
@@ -545,7 +545,7 @@
{
return NULL;
}
- hdr_count = axis2_array_list_size(header_list, env);
+ hdr_count = axutil_array_list_size(header_list, env);
if (0 == hdr_count)
{
return NULL;
@@ -554,7 +554,7 @@
for (i = 0; i < hdr_count; i++)
{
axis2_http_header_t *tmp_hdr = NULL;
- tmp_hdr = axis2_array_list_get(header_list, env, i);
+ tmp_hdr = axutil_array_list_get(header_list, env, i);
if (!tmp_hdr)
{
continue;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c Fri Mar 30 06:19:43 2007
@@ -16,7 +16,7 @@
*/
#include <axis2_http_response_writer.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_http_transport.h>
#include <axis2_string.h>
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c Fri Mar 30 06:19:43 2007
@@ -460,7 +460,7 @@
{
axis2_http_response_writer_t *response_writer = NULL;
axis2_simple_http_svr_conn_impl_t *svr_conn_impl = NULL;
- axis2_array_list_t *headers = NULL;
+ axutil_array_list_t *headers = NULL;
axis2_stream_t *response_stream = NULL;
axis2_char_t *response_body = NULL;
int body_size = 0;
@@ -526,10 +526,10 @@
if (headers)
{
- for (i = 0; i < axis2_array_list_size(headers, env); i++)
+ for (i = 0; i < axutil_array_list_size(headers, env); i++)
{
axis2_http_header_t *header = NULL;
- header = (axis2_http_header_t *)axis2_array_list_get(headers, env,
+ header = (axis2_http_header_t *)axutil_array_list_get(headers, env,
i);
if (header)
{
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c Fri Mar 30 06:19:43 2007
@@ -131,7 +131,7 @@
)
{
char *wire_format = NULL;
- axis2_array_list_t *headers = NULL;
+ axutil_array_list_t *headers = NULL;
char *str_header = NULL;
char *str_body = NULL;
char *str_request_line = NULL;
@@ -230,14 +230,14 @@
headers = AXIS2_HTTP_SIMPLE_REQUEST_GET_HEADERS(request, env);
if (headers)
{
- int header_count = axis2_array_list_size(headers, env);
+ int header_count = axutil_array_list_size(headers, env);
int i = 0;
char *str_header2 = NULL;
for (i = 0; i < header_count; i++)
{
axis2_char_t *header_ext_form = NULL;
axis2_http_header_t *tmp_header = (axis2_http_header_t *)
- axis2_array_list_get(headers, env, i);
+ axutil_array_list_get(headers, env, i);
if (! tmp_header)
{
continue;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org