You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by na...@apache.org on 2007/03/07 05:31:20 UTC
svn commit: r515446 - in /webservices/sandesha/trunk/c/src: client/
handlers/ msgprocessors/ polling/ storage/inmemory/ storage/permanent/
util/ workers/ wsrm/
Author: nandika
Date: Tue Mar 6 20:31:18 2007
New Revision: 515446
URL: http://svn.apache.org/viewvc?view=rev&rev=515446
Log:
array list macros droped
Modified:
webservices/sandesha/trunk/c/src/client/report.c
webservices/sandesha/trunk/c/src/client/sequence_report.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
webservices/sandesha/trunk/c/src/polling/polling_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c
webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_transaction.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
webservices/sandesha/trunk/c/src/util/ack_mgr.c
webservices/sandesha/trunk/c/src/util/fault_mgr.c
webservices/sandesha/trunk/c/src/util/msg_creator.c
webservices/sandesha/trunk/c/src/util/property_bean.c
webservices/sandesha/trunk/c/src/util/property_mgr.c
webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
webservices/sandesha/trunk/c/src/util/terminate_mgr.c
webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
webservices/sandesha/trunk/c/src/workers/sender.c
webservices/sandesha/trunk/c/src/workers/sender_worker.c
webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
Modified: webservices/sandesha/trunk/c/src/client/report.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/report.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/client/report.c (original)
+++ webservices/sandesha/trunk/c/src/client/report.c Tue Mar 6 20:31:18 2007
@@ -178,13 +178,13 @@
if(report_impl->incoming_seq_list)
{
- AXIS2_ARRAY_LIST_FREE(report_impl->incoming_seq_list, env);
+ axis2_array_list_free(report_impl->incoming_seq_list, env);
report_impl->incoming_seq_list = NULL;
}
if(report_impl->outgoing_seq_list)
{
- AXIS2_ARRAY_LIST_FREE(report_impl->outgoing_seq_list, env);
+ axis2_array_list_free(report_impl->outgoing_seq_list, env);
report_impl->outgoing_seq_list = NULL;
}
@@ -296,7 +296,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
report_impl = SANDESHA2_INTF_TO_IMPL(report);
- AXIS2_ARRAY_LIST_ADD(report_impl->incoming_seq_list, env, incoming_seq_id);
+ axis2_array_list_add(report_impl->incoming_seq_list, env, incoming_seq_id);
return AXIS2_SUCCESS;
}
@@ -311,7 +311,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
report_impl = SANDESHA2_INTF_TO_IMPL(report);
- AXIS2_ARRAY_LIST_ADD(report_impl->outgoing_seq_list, env, out_seq_id);
+ axis2_array_list_add(report_impl->outgoing_seq_list, env, out_seq_id);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/client/sequence_report.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/sequence_report.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/client/sequence_report.c (original)
+++ webservices/sandesha/trunk/c/src/client/sequence_report.c Tue Mar 6 20:31:18 2007
@@ -167,7 +167,7 @@
if(report_impl->completed_msgs)
{
- AXIS2_ARRAY_LIST_FREE(report_impl->completed_msgs, env);
+ axis2_array_list_free(report_impl->completed_msgs, env);
report_impl->completed_msgs = NULL;
}
@@ -317,7 +317,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
report_impl = SANDESHA2_INTF_TO_IMPL(report);
- AXIS2_ARRAY_LIST_ADD(report_impl->completed_msgs, env, msg_no);
+ axis2_array_list_add(report_impl->completed_msgs, env, msg_no);
return AXIS2_SUCCESS;
}
@@ -336,15 +336,15 @@
{
int i = 0, size = 0;
- size = AXIS2_ARRAY_LIST_SIZE(report_impl->completed_msgs, env);
+ size = axis2_array_list_size(report_impl->completed_msgs, env);
for(i = 0; i < size; i++)
{
long *msg_no = NULL;
- msg_no = AXIS2_ARRAY_LIST_GET(report_impl->completed_msgs, env, i);
+ msg_no = axis2_array_list_get(report_impl->completed_msgs, env, i);
AXIS2_FREE(env->allocator, msg_no);
}
- AXIS2_ARRAY_LIST_FREE(report_impl->completed_msgs, env);
+ axis2_array_list_free(report_impl->completed_msgs, env);
report_impl->completed_msgs = NULL;
}
report_impl->completed_msgs = completed_msgs;
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_global_in_handler.c Tue Mar 6 20:31:18 2007
@@ -219,7 +219,7 @@
const axis2_char_t *relates_to_val = NULL;
axis2_op_ctx_t *op_ctx = NULL;
- relates_to_val = AXIS2_RELATES_TO_GET_VALUE(relates_to, env);
+ relates_to_val = axis2_relates_to_get_value(relates_to, env);
op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, relates_to_val);
if(op_ctx)
{
@@ -338,12 +338,12 @@
msg_no_list = sandesha2_utils_get_array_list_from_string(env,
rcvd_msgs_str);
if(msg_no_list)
- size = AXIS2_ARRAY_LIST_SIZE(msg_no_list, env);
+ size = axis2_array_list_size(msg_no_list, env);
for(i = 0; i < size; i++)
{
axis2_char_t *temp = NULL;
- temp = AXIS2_ARRAY_LIST_GET(msg_no_list, env, i);
+ temp = axis2_array_list_get(msg_no_list, env, i);
if(atol(temp) == msg_no)
drop = AXIS2_TRUE;
}
@@ -417,7 +417,7 @@
axis2_op_ctx_t *op_ctx = NULL;
axis2_op_ctx_t *op_ctx1 = NULL;
- relates_to_val = AXIS2_RELATES_TO_GET_VALUE(relates_to, env);
+ relates_to_val = axis2_relates_to_get_value(relates_to, env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(sandesha2_msg_ctx_get_msg_ctx(
rm_msg_ctx, env), env);
op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, relates_to_val);
Modified: webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c (original)
+++ webservices/sandesha/trunk/c/src/handlers/sandesha2_out_handler.c Tue Mar 6 20:31:18 2007
@@ -136,7 +136,7 @@
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
- qname = AXIS2_ARRAY_LIST_GET(mod_qnames, env, i);
+ qname = axis2_array_list_get(mod_qnames, env, i);
if (qname)
{
found = axis2_qname_equals(mod_qname, env, qname);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_msg_processor.c Tue Mar 6 20:31:18 2007
@@ -255,7 +255,7 @@
long upper = -1;
long j = 0;
- ack_range = AXIS2_ARRAY_LIST_GET(ack_range_list, env, i);
+ ack_range = axis2_array_list_get(ack_range_list, env, i);
lower = sandesha2_ack_range_get_lower_value(ack_range, env);
upper = sandesha2_ack_range_get_upper_value(ack_range, env);
for(j = lower; j <= upper; j++)
@@ -276,13 +276,13 @@
}
add_no = AXIS2_MALLOC(env->allocator, sizeof(long));
*add_no = (long)j;
- AXIS2_ARRAY_LIST_ADD(acked_list, env, add_no);
+ axis2_array_list_add(acked_list, env, add_no);
}
}
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(nack_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(nack_list, env); i++)
{
sandesha2_nack_t *nack = NULL;
- nack = AXIS2_ARRAY_LIST_GET(nack_list, env, i);
+ nack = axis2_array_list_get(nack_list, env, i);
/* TODO processing nacks */
}
no_of_msgs_acked = sandesha2_ack_msg_processor_get_no_of_msgs_acked(
@@ -369,10 +369,10 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, list, NULL);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(list, env); i++)
+ for(i = 0; i < axis2_array_list_size(list, env); i++)
{
sandesha2_sender_bean_t *bean = NULL;
- bean = AXIS2_ARRAY_LIST_GET(list, env, i);
+ bean = axis2_array_list_get(list, env, i);
if(sandesha2_sender_bean_get_msg_no(bean, env) == msg_no)
return bean;
}
@@ -390,14 +390,14 @@
AXIS2_ENV_CHECK(env, -1);
AXIS2_PARAM_CHECK(env->error, list, -1);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(list, env); i++)
+ for(i = 0; i < axis2_array_list_size(list, env); i++)
{
sandesha2_ack_range_t *ack_range = NULL;
long upper = 0;
long lower = 0;
long diff = 0;
- ack_range = AXIS2_ARRAY_LIST_GET(list, env, i);
+ ack_range = axis2_array_list_get(list, env, i);
lower = sandesha2_ack_range_get_lower_value(ack_range, env);
upper = sandesha2_ack_range_get_upper_value(ack_range, env);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/ack_req_msg_processor.c Tue Mar 6 20:31:18 2007
@@ -333,11 +333,11 @@
if(found_list)
{
int i = 0;
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(found_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(found_list, env); i++)
{
axis2_char_t *msg_stored_key = NULL;
sandesha2_sender_bean_t *old_ack_bean = NULL;
- old_ack_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
+ old_ack_bean = axis2_array_list_get(found_list, env, i);
time_to_send = sandesha2_sender_bean_get_time_to_send(
old_ack_bean, env);
/*char *msg_id = sandesha2_sender_bean_get_msg_id(old_ack_bean, env);*/
Modified: webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/app_msg_processor.c Tue Mar 6 20:31:18 2007
@@ -481,7 +481,7 @@
incoming_seq_list, str_seq_id))
{
axis2_char_t *str_seq_list = NULL;
- AXIS2_ARRAY_LIST_ADD(incoming_seq_list, env, str_seq_id);
+ axis2_array_list_add(incoming_seq_list, env, str_seq_id);
str_seq_list = sandesha2_utils_array_list_to_string(env,
incoming_seq_list, SANDESHA2_ARRAY_LIST_STRING);
/* saving the property. */
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_msg_processor.c Tue Mar 6 20:31:18 2007
@@ -386,7 +386,7 @@
if(1 >= AXIS2_STRLEN(seq_id))
return AXIS2_FALSE;
- if(NULL != list && 0 < AXIS2_ARRAY_LIST_SIZE(list, env))
+ if(NULL != list && 0 < axis2_array_list_size(list, env))
return AXIS2_FALSE;
return AXIS2_TRUE;
Modified: webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/create_seq_res_msg_processor.c Tue Mar 6 20:31:18 2007
@@ -230,7 +230,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- create_seq_msg_id = (axis2_char_t *) AXIS2_RELATES_TO_GET_VALUE(relates_to, env);
+ create_seq_msg_id = (axis2_char_t *) axis2_relates_to_get_value(relates_to, env);
retrans_mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
create_seq_mgr = sandesha2_storage_mgr_get_create_seq_mgr(storage_mgr, env);
create_seq_bean = sandesha2_create_seq_mgr_retrieve(create_seq_mgr, env,
@@ -387,7 +387,7 @@
found_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env,
target_bean);
if(found_list)
- size = AXIS2_ARRAY_LIST_SIZE(found_list, env);
+ size = axis2_array_list_size(found_list, env);
for(i = 0; i < size; i++)
{
sandesha2_sender_bean_t *tmp_bean = NULL;
@@ -400,7 +400,7 @@
sandesha2_identifier_t *ident = NULL;
sandesha2_ack_requested_t *ack_req_part = NULL;
- tmp_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
+ tmp_bean = axis2_array_list_get(found_list, env, i);
key = sandesha2_sender_bean_get_msg_ctx_ref_key(tmp_bean, env);
app_msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env,
key, conf_ctx);
Modified: webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/make_connection_msg_processor.c Tue Mar 6 20:31:18 2007
@@ -239,7 +239,7 @@
}
/* Selecting a bean to send randomly. TODO - Should use a better mechanism */
if(retrans_list)
- size = AXIS2_ARRAY_LIST_SIZE(retrans_list, env);
+ size = axis2_array_list_size(retrans_list, env);
if(size > 0)
{
unsigned int rand_var = axis2_rand_get_seed_value_based_on_time(env);
@@ -253,7 +253,7 @@
for(item = 0; item < size; item++)
{
- sender_bean = (sandesha2_sender_bean_t *) AXIS2_ARRAY_LIST_GET(
+ sender_bean = (sandesha2_sender_bean_t *) axis2_array_list_get(
retrans_list, env, item);
if(item == item_to_pick)
break;
@@ -339,13 +339,13 @@
int j = 0;
axis2_bool_t continue_sending = AXIS2_FALSE;
- for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(msgs_not_to_send, env); j++)
+ for(j = 0; j < axis2_array_list_size(msgs_not_to_send, env); j++)
{
axis2_char_t *value = NULL;
int int_val = -1;
int msg_type = -1;
- value = AXIS2_ARRAY_LIST_GET(msgs_not_to_send, env, j);
+ value = axis2_array_list_get(msgs_not_to_send, env, j);
int_val = atoi(value);
msg_type = sandesha2_msg_ctx_get_msg_type(return_rm_msg_ctx, env);
if(msg_type == int_val)
Modified: webservices/sandesha/trunk/c/src/polling/polling_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/polling/polling_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/polling_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/polling/polling_mgr.c Tue Mar 6 20:31:18 2007
@@ -127,7 +127,7 @@
}
if(polling_mgr->scheduled_polling_reqs)
{
- AXIS2_ARRAY_LIST_FREE(polling_mgr->scheduled_polling_reqs, env);
+ axis2_array_list_free(polling_mgr->scheduled_polling_reqs, env);
polling_mgr->scheduled_polling_reqs = NULL;
}
AXIS2_FREE(env->allocator, polling_mgr);
@@ -249,13 +249,13 @@
* do the earliest one. else pick one randomly.
*/
if(polling_mgr->scheduled_polling_reqs)
- size = AXIS2_ARRAY_LIST_SIZE(polling_mgr->scheduled_polling_reqs,
+ size = axis2_array_list_size(polling_mgr->scheduled_polling_reqs,
env);
if(size > 0)
{
- seq_id = AXIS2_ARRAY_LIST_GET(polling_mgr->scheduled_polling_reqs,
+ seq_id = axis2_array_list_get(polling_mgr->scheduled_polling_reqs,
env, 0);
- AXIS2_ARRAY_LIST_REMOVE(polling_mgr->scheduled_polling_reqs, env, 0);
+ axis2_array_list_remove(polling_mgr->scheduled_polling_reqs, env, 0);
}
if(!seq_id)
{
@@ -270,7 +270,7 @@
results = sandesha2_next_msg_mgr_find(next_msg_mgr, env,
find_bean);
if(results)
- size = AXIS2_ARRAY_LIST_SIZE(results, env);
+ size = axis2_array_list_size(results, env);
if(size > 0)
{
unsigned int rand_var =
@@ -278,7 +278,7 @@
int item = axis2_rand_with_range(&rand_var, 0, size);
item--;
next_msg_bean = (sandesha2_next_msg_bean_t *)
- AXIS2_ARRAY_LIST_GET(results, env, item);
+ axis2_array_list_get(results, env, item);
}
}
@@ -411,10 +411,10 @@
const axis2_env_t *env,
axis2_char_t *internal_seq_id)
{
- if(!AXIS2_ARRAY_LIST_CONTAINS(polling_mgr->scheduled_polling_reqs, env,
+ if(!axis2_array_list_contains(polling_mgr->scheduled_polling_reqs, env,
internal_seq_id))
{
- AXIS2_ARRAY_LIST_ADD(polling_mgr->scheduled_polling_reqs, env,
+ axis2_array_list_add(polling_mgr->scheduled_polling_reqs, env,
internal_seq_id);
}
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_bean_mgr.c Tue Mar 6 20:31:18 2007
@@ -371,27 +371,27 @@
if(bean && sandesha2_inmemory_bean_mgr_match(bean_mgr, env, bean,
candidate))
{
- AXIS2_ARRAY_LIST_ADD(beans, env, candidate);
+ axis2_array_list_add(beans, env, candidate);
}
if(!bean)
- AXIS2_ARRAY_LIST_ADD(beans, env, candidate);
+ axis2_array_list_add(beans, env, candidate);
}
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
/* Now we have a point-in-time view of the beans, lock them all.*/
- size = AXIS2_ARRAY_LIST_SIZE(beans, env);
+ size = axis2_array_list_size(beans, env);
for(i = 0; i < size; i++)
{
- /*sandesha2_rm_bean_t *temp = AXIS2_ARRAY_LIST_GET(beans, env, i);
+ /*sandesha2_rm_bean_t *temp = axis2_array_list_get(beans, env, i);
if(temp)
sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env,
temp);*/
}
/* Finally remove any beans that are no longer in the table */
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
- size = AXIS2_ARRAY_LIST_SIZE(beans, env);
+ size = axis2_array_list_size(beans, env);
for(i = 0; i < size; i++)
{
- sandesha2_rm_bean_t *temp = AXIS2_ARRAY_LIST_GET(beans, env, i);
+ sandesha2_rm_bean_t *temp = axis2_array_list_get(beans, env, i);
if(temp)
{
axis2_char_t *key = sandesha2_rm_bean_get_key(temp, env);
@@ -401,12 +401,12 @@
AXIS2_HASH_KEY_STRING);
if(!value)
{
- AXIS2_ARRAY_LIST_REMOVE(beans, env, i);
+ axis2_array_list_remove(beans, env, i);
}
}
else
{
- AXIS2_ARRAY_LIST_REMOVE(beans, env, i);
+ axis2_array_list_remove(beans, env, i);
}
}
}
@@ -429,7 +429,7 @@
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
beans = sandesha2_inmemory_bean_mgr_find(bean_mgr, env, bean);
if(beans)
- size = AXIS2_ARRAY_LIST_SIZE(beans, env);
+ size = axis2_array_list_size(beans, env);
if( size > 1)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Non-Unique result");
@@ -437,7 +437,7 @@
return NULL;
}
if(size == 1)
- ret = AXIS2_ARRAY_LIST_GET(beans, env, 0);
+ ret = axis2_array_list_get(beans, env, 0);
return ret;
}
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_next_msg_mgr.c Tue Mar 6 20:31:18 2007
@@ -145,7 +145,7 @@
}
if(next_msg_mgr_impl->values)
{
- AXIS2_ARRAY_LIST_FREE(next_msg_mgr_impl->values, env);
+ axis2_array_list_free(next_msg_mgr_impl->values, env);
next_msg_mgr_impl->values = NULL;
}
if(next_msg_mgr_impl)
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_sender_mgr.c Tue Mar 6 20:31:18 2007
@@ -424,12 +424,12 @@
* message first then we are done.
*/
if(match_list)
- size = AXIS2_ARRAY_LIST_SIZE(match_list, env);
+ size = axis2_array_list_size(match_list, env);
for(i = 0; i < size; i++)
{
sandesha2_sender_bean_t *bean = NULL;
int msg_type = -1;
- bean = (sandesha2_sender_bean_t *) AXIS2_ARRAY_LIST_GET(match_list,
+ bean = (sandesha2_sender_bean_t *) axis2_array_list_get(match_list,
env, i);
msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_seq_property_mgr.c Tue Mar 6 20:31:18 2007
@@ -149,7 +149,7 @@
if(seq_prop_mgr_impl->values)
{
- AXIS2_ARRAY_LIST_FREE(seq_prop_mgr_impl->values, env);
+ axis2_array_list_free(seq_prop_mgr_impl->values, env);
seq_prop_mgr_impl->values = NULL;
}
if(seq_prop_mgr_impl->bean_mgr)
Modified: webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_transaction.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_transaction.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/inmemory_transaction.c Tue Mar 6 20:31:18 2007
@@ -122,7 +122,7 @@
}
if(trans_impl->enlisted_beans)
{
- AXIS2_ARRAY_LIST_FREE(trans_impl->enlisted_beans, env);
+ axis2_array_list_free(trans_impl->enlisted_beans, env);
trans_impl->enlisted_beans = NULL;
}
if(trans_impl)
@@ -142,7 +142,7 @@
sandesha2_inmemory_transaction_impl_t *trans_impl = NULL;
trans_impl = SANDESHA2_INTF_TO_IMPL(trans);
if(trans_impl->enlisted_beans)
- size = AXIS2_ARRAY_LIST_SIZE(trans_impl->enlisted_beans, env);
+ size = axis2_array_list_size(trans_impl->enlisted_beans, env);
if(size > 0)
return AXIS2_TRUE;
else
@@ -174,18 +174,18 @@
int i = 0, size = 0;
trans_impl = SANDESHA2_INTF_TO_IMPL(trans);
if(trans_impl->enlisted_beans)
- size = AXIS2_ARRAY_LIST_SIZE(trans_impl->enlisted_beans, env);
+ size = axis2_array_list_size(trans_impl->enlisted_beans, env);
for(i = 0; i < size; i++)
{
sandesha2_rm_bean_t *rm_bean_l = NULL;
sandesha2_rm_bean_t *rm_bean = (sandesha2_rm_bean_t *)
- AXIS2_ARRAY_LIST_GET(trans_impl->enlisted_beans, env, i);
+ axis2_array_list_get(trans_impl->enlisted_beans, env, i);
rm_bean_l = sandesha2_rm_bean_get_base(rm_bean, env);
axis2_thread_mutex_lock(trans_impl->mutex);
sandesha2_rm_bean_set_transaction(rm_bean_l, env, NULL);
axis2_thread_mutex_unlock(trans_impl->mutex);
}
- AXIS2_ARRAY_LIST_FREE(trans_impl->enlisted_beans, env);
+ axis2_array_list_free(trans_impl->enlisted_beans, env);
trans_impl->enlisted_beans = NULL;
}
@@ -210,7 +210,7 @@
{
int size = 0;
if(trans_impl->enlisted_beans)
- size = AXIS2_ARRAY_LIST_SIZE(trans_impl->enlisted_beans, env);
+ size = axis2_array_list_size(trans_impl->enlisted_beans, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "size:%d", size);
if(size > 0)
{
@@ -224,7 +224,7 @@
if(!other)
{
sandesha2_rm_bean_set_transaction(rm_bean_l, env, trans);
- AXIS2_ARRAY_LIST_ADD(trans_impl->enlisted_beans, env, rm_bean);
+ axis2_array_list_add(trans_impl->enlisted_beans, env, rm_bean);
}
axis2_thread_mutex_unlock(trans_impl->mutex);
}
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_bean_mgr.c Tue Mar 6 20:31:18 2007
@@ -599,7 +599,7 @@
{
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
if(data_array)
- AXIS2_ARRAY_LIST_FREE(data_array, env);
+ axis2_array_list_free(data_array, env);
if(args)
AXIS2_FREE(env->allocator, args);
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
@@ -611,42 +611,42 @@
return NULL;
}
if(data_array)
- size = AXIS2_ARRAY_LIST_SIZE(data_array, env);
+ size = axis2_array_list_size(data_array, env);
for(i = 0; i < size; i++)
{
sandesha2_rm_bean_t *candidate = NULL;
- candidate = (sandesha2_rm_bean_t *) AXIS2_ARRAY_LIST_GET(data_array,
+ candidate = (sandesha2_rm_bean_t *) axis2_array_list_get(data_array,
env, i);
if(!candidate)
continue;
if(bean && sandesha2_permanent_bean_mgr_match(bean_mgr, env, bean,
candidate))
{
- AXIS2_ARRAY_LIST_ADD(beans, env, candidate);
+ axis2_array_list_add(beans, env, candidate);
}
if(!bean)
- AXIS2_ARRAY_LIST_ADD(beans, env, candidate);
+ axis2_array_list_add(beans, env, candidate);
}
if(data_array)
- AXIS2_ARRAY_LIST_FREE(data_array, env);
+ axis2_array_list_free(data_array, env);
if(args)
AXIS2_FREE(env->allocator, args);
axis2_thread_mutex_unlock(bean_mgr_impl->mutex);
/* Now we have a point-in-time view of the beans, lock them all.*/
- size = AXIS2_ARRAY_LIST_SIZE(beans, env);
+ size = axis2_array_list_size(beans, env);
for(i = 0; i < size; i++)
{
- sandesha2_rm_bean_t *temp = AXIS2_ARRAY_LIST_GET(beans, env, i);
+ sandesha2_rm_bean_t *temp = axis2_array_list_get(beans, env, i);
if(temp)
sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env,
temp);
}
/* Finally remove any beans that are no longer in the table */
axis2_thread_mutex_lock(bean_mgr_impl->mutex);
- size = AXIS2_ARRAY_LIST_SIZE(beans, env);
+ size = axis2_array_list_size(beans, env);
for(i = 0; i < size; i++)
{
- sandesha2_rm_bean_t *temp = AXIS2_ARRAY_LIST_GET(beans, env, i);
+ sandesha2_rm_bean_t *temp = axis2_array_list_get(beans, env, i);
if(temp)
{
int count = -1;
@@ -669,7 +669,7 @@
}
if(count == 0)
{
- AXIS2_ARRAY_LIST_REMOVE(beans, env, i);
+ axis2_array_list_remove(beans, env, i);
}
}
}
@@ -697,7 +697,7 @@
beans = sandesha2_permanent_bean_mgr_find(bean_mgr, env, bean, find_func,
count_func, sql_stmt_find, sql_stmt_count);
if(beans)
- size = AXIS2_ARRAY_LIST_SIZE(beans, env);
+ size = axis2_array_list_size(beans, env);
if( size > 1)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[sandesha2] Non-Unique result");
@@ -706,7 +706,7 @@
return NULL;
}
if(size == 1)
- ret = AXIS2_ARRAY_LIST_GET(beans, env, 0);
+ ret = axis2_array_list_get(beans, env, 0);
return ret;
}
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_next_msg_mgr.c Tue Mar 6 20:31:18 2007
@@ -251,7 +251,7 @@
}
if(next_msg_mgr_impl->values)
{
- AXIS2_ARRAY_LIST_FREE(next_msg_mgr_impl->values, env);
+ axis2_array_list_free(next_msg_mgr_impl->values, env);
next_msg_mgr_impl->values = NULL;
}
if(next_msg_mgr_impl)
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_sender_mgr.c Tue Mar 6 20:31:18 2007
@@ -664,12 +664,12 @@
* message first then we are done.
*/
if(match_list)
- size = AXIS2_ARRAY_LIST_SIZE(match_list, env);
+ size = axis2_array_list_size(match_list, env);
for(i = 0; i < size; i++)
{
sandesha2_sender_bean_t *bean = NULL;
int msg_type = -1;
- bean = (sandesha2_sender_bean_t *) AXIS2_ARRAY_LIST_GET(match_list,
+ bean = (sandesha2_sender_bean_t *) axis2_array_list_get(match_list,
env, i);
msg_type = sandesha2_sender_bean_get_msg_type(bean, env);
if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_seq_property_mgr.c Tue Mar 6 20:31:18 2007
@@ -237,7 +237,7 @@
if(seq_prop_mgr_impl->values)
{
- AXIS2_ARRAY_LIST_FREE(seq_prop_mgr_impl->values, env);
+ axis2_array_list_free(seq_prop_mgr_impl->values, env);
seq_prop_mgr_impl->values = NULL;
}
if(seq_prop_mgr_impl->bean_mgr)
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_storage_mgr.c Tue Mar 6 20:31:18 2007
@@ -1126,9 +1126,9 @@
axis2_array_list_t *values = sandesha2_utils_split(env, str,
SANDESHA2_PERSISTANT_PROPERTY_SEPERATOR);
if(values)
- size = AXIS2_ARRAY_LIST_SIZE(values, env);
+ size = axis2_array_list_size(values, env);
if((size % 2 != 0) || (size == 1 && 0 == AXIS2_STRCMP("",
- AXIS2_ARRAY_LIST_GET(values, env, 0))))
+ axis2_array_list_get(values, env, 0))))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"Invalid persistence property string");
@@ -1138,8 +1138,8 @@
}
for(i = 0; i < size; i=i+2)
{
- axis2_char_t *key = AXIS2_ARRAY_LIST_GET(values, env, i);
- axis2_char_t *value = AXIS2_ARRAY_LIST_GET(values, env, i+1);
+ axis2_char_t *key = axis2_array_list_get(values, env, i);
+ axis2_char_t *value = axis2_array_list_get(values, env, i+1);
axis2_property_t *property = axis2_property_create_with_args(env, 0,
0, 0, value);
axis2_hash_set(map, key, AXIS2_HASH_KEY_STRING, property);
Modified: webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/permanent_transaction.c Tue Mar 6 20:31:18 2007
@@ -199,7 +199,7 @@
}
if(trans_impl->enlisted_beans)
{
- AXIS2_ARRAY_LIST_FREE(trans_impl->enlisted_beans, env);
+ axis2_array_list_free(trans_impl->enlisted_beans, env);
trans_impl->enlisted_beans = NULL;
}
if(trans_impl)
@@ -239,7 +239,7 @@
trans_impl = SANDESHA2_INTF_TO_IMPL(trans);
/*int size = 0;
if(trans_impl->enlisted_beans)
- size = AXIS2_ARRAY_LIST_SIZE(trans_impl->enlisted_beans, env);
+ size = axis2_array_list_size(trans_impl->enlisted_beans, env);
if(size > 0)
return AXIS2_TRUE;
else
@@ -320,18 +320,18 @@
sandesha2_permanent_storage_mgr_remove_transaction(trans_impl->storage_mgr,
env, trans);
if(trans_impl->enlisted_beans)
- size = AXIS2_ARRAY_LIST_SIZE(trans_impl->enlisted_beans, env);
+ size = axis2_array_list_size(trans_impl->enlisted_beans, env);
for(i = 0; i < size; i++)
{
sandesha2_rm_bean_t *rm_bean_l = NULL;
sandesha2_rm_bean_t *rm_bean = (sandesha2_rm_bean_t *)
- AXIS2_ARRAY_LIST_GET(trans_impl->enlisted_beans, env, i);
+ axis2_array_list_get(trans_impl->enlisted_beans, env, i);
rm_bean_l = sandesha2_rm_bean_get_base(rm_bean, env);
axis2_thread_mutex_lock(trans_impl->mutex);
sandesha2_rm_bean_set_transaction(rm_bean_l, env, NULL);
axis2_thread_mutex_unlock(trans_impl->mutex);
}
- /*AXIS2_ARRAY_LIST_FREE(trans_impl->enlisted_beans, env);
+ /*axis2_array_list_free(trans_impl->enlisted_beans, env);
trans_impl->enlisted_beans = NULL;*/
}
@@ -362,7 +362,7 @@
{
int size = 0;
if(trans_impl->enlisted_beans)
- size = AXIS2_ARRAY_LIST_SIZE(trans_impl->enlisted_beans, env);
+ size = axis2_array_list_size(trans_impl->enlisted_beans, env);
if(size > 0)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Possible deadlock");
@@ -378,7 +378,7 @@
if(!other)
{
sandesha2_rm_bean_set_transaction(rm_bean_l, env, trans);
- AXIS2_ARRAY_LIST_ADD(trans_impl->enlisted_beans, env, rm_bean);
+ axis2_array_list_add(trans_impl->enlisted_beans, env, rm_bean);
}
axis2_thread_mutex_unlock(trans_impl->mutex);
}
Modified: webservices/sandesha/trunk/c/src/util/ack_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/ack_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/util/ack_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/ack_mgr.c Tue Mar 6 20:31:18 2007
@@ -213,10 +213,10 @@
bean_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env,
find_bean);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(bean_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(bean_list, env); i++)
{
sandesha2_sender_bean_t *old_ack_bean = NULL;
- old_ack_bean = AXIS2_ARRAY_LIST_GET(bean_list, env, i);
+ old_ack_bean = axis2_array_list_get(bean_list, env, i);
time_to_send = sandesha2_sender_bean_get_time_to_send(old_ack_bean,
env);
/*axis2_char_t *msg_id = sandesha2_sender_bean_get_msg_id((const sandesha2_sender_bean_t *)old_ack_bean, env);*/
@@ -356,11 +356,11 @@
AXIS2_PARAM_CHECK(env->error, ack_ranges, AXIS2_FALSE);
hash = axis2_hash_make(env);
- for(i = 0; i< AXIS2_ARRAY_LIST_SIZE(ack_ranges, env); i++)
+ for(i = 0; i< axis2_array_list_size(ack_ranges, env); i++)
{
sandesha2_ack_range_t *ack_range = NULL;
- ack_range = AXIS2_ARRAY_LIST_GET(ack_ranges, env, i);
+ ack_range = axis2_array_list_get(ack_ranges, env, i);
sprintf(tmp, "%ld", sandesha2_ack_range_get_lower_value(ack_range, env));
axis2_hash_set(hash, tmp, AXIS2_HASH_KEY_STRING, ack_range);
}
@@ -419,13 +419,13 @@
found_list = sandesha2_sender_mgr_find_by_sender_bean(retrans_mgr, env,
find_bean);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(found_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(found_list, env); i++)
{
sandesha2_sender_bean_t *sender_bean = NULL;
long timenow = 0;
timenow = sandesha2_utils_get_current_time_in_millis(env);
- sender_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
+ sender_bean = axis2_array_list_get(found_list, env, i);
if(sandesha2_sender_bean_get_time_to_send(sender_bean, env) > timenow)
{
Modified: webservices/sandesha/trunk/c/src/util/fault_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/fault_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/util/fault_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/fault_mgr.c Tue Mar 6 20:31:18 2007
@@ -191,7 +191,7 @@
find_bean);
if(list)
{
- if(0 == AXIS2_ARRAY_LIST_SIZE(list, env))
+ if(0 == axis2_array_list_size(list, env))
valid_seq = AXIS2_FALSE;
}
else
@@ -208,14 +208,14 @@
list = sandesha2_next_msg_mgr_retrieve_all(next_msg_mgr, env);
if(list)
{
- int size = AXIS2_ARRAY_LIST_SIZE(list, env);
+ int size = axis2_array_list_size(list, env);
int i = 0;
for(i = 0; i < size; i++)
{
sandesha2_next_msg_bean_t *next_bean = NULL;
axis2_char_t *tmp_id = NULL;
- next_bean = AXIS2_ARRAY_LIST_GET(list, env, i);
+ next_bean = axis2_array_list_get(list, env, i);
tmp_id = sandesha2_next_msg_bean_get_seq_id(
(sandesha2_rm_bean_t *) next_bean, env);
if(0 == AXIS2_STRCMP(seq_id, tmp_id))
@@ -286,12 +286,12 @@
if(ack_range_list)
{
int i = 0;
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(ack_range_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(ack_range_list, env); i++)
{
sandesha2_ack_range_t *ack_range = NULL;
long upper = -1;
long lower = -1;
- ack_range = AXIS2_ARRAY_LIST_GET(ack_range_list, env, i);
+ ack_range = axis2_array_list_get(ack_range_list, env, i);
lower = sandesha2_ack_range_get_lower_value(ack_range, env);
upper = sandesha2_ack_range_get_upper_value(ack_range, env);
if(lower > upper)
Modified: webservices/sandesha/trunk/c/src/util/msg_creator.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/msg_creator.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/util/msg_creator.c (original)
+++ webservices/sandesha/trunk/c/src/util/msg_creator.c Tue Mar 6 20:31:18 2007
@@ -718,7 +718,7 @@
int i = 0, size = 0;
new_op = AXIS2_MSG_CTX_GET_OP(new_msg, env);
- size = AXIS2_ARRAY_LIST_SIZE(op_params, env);
+ size = axis2_array_list_size(op_params, env);
for(i = 0; i < size; i++)
{
axis2_param_t *next_param = NULL;
@@ -726,7 +726,7 @@
axis2_char_t *temp_name = NULL;
void *temp_value = NULL;
- next_param = (axis2_param_t *) AXIS2_ARRAY_LIST_GET(op_params,
+ next_param = (axis2_param_t *) axis2_array_list_get(op_params,
env, i);
temp_name = AXIS2_PARAM_GET_NAME(next_param, env);
temp_value = AXIS2_PARAM_GET_VALUE(next_param, env);
@@ -938,12 +938,12 @@
ack_range_list = sandesha2_utils_get_ack_range_list(env, msg_no_list,
rm_ns_value);
if(ack_range_list)
- size = AXIS2_ARRAY_LIST_SIZE(ack_range_list, env);
+ size = axis2_array_list_size(ack_range_list, env);
for(i = 0; i < size; i++)
{
sandesha2_ack_range_t *ack_range = NULL;
- ack_range = AXIS2_ARRAY_LIST_GET(ack_range_list, env, i);
+ ack_range = axis2_array_list_get(ack_range_list, env, i);
sandesha2_seq_ack_add_ack_range(seq_ack, env, ack_range);
}
seq_closed_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr, env, seq_id,
@@ -1028,34 +1028,34 @@
axis2_op_t *make_conn_op = AXIS2_MSG_CTX_GET_OP(make_conn_msg_ctx, env);
axis2_array_list_t *out_flow = AXIS2_OP_GET_OUT_FLOW(op, env);
axis2_array_list_t *in_flow = AXIS2_OP_GET_IN_FLOW(op, env);
- int size = AXIS2_ARRAY_LIST_SIZE(out_flow, env);
+ int size = axis2_array_list_size(out_flow, env);
if(size > 0)
{
int i = 0;
axis2_array_list_t *new_flow = axis2_array_list_create(env, 0);
for(i = 0; i < size; i++)
{
- const axis2_phase_t *phase = AXIS2_ARRAY_LIST_GET(out_flow, env, i);
+ const axis2_phase_t *phase = axis2_array_list_get(out_flow, env, i);
const axis2_char_t *phase_name = AXIS2_PHASE_GET_NAME(phase, env);
if(0 == AXIS2_STRCMP(phase_name, AXIS2_PHASE_MESSAGE_OUT))
{
- AXIS2_ARRAY_LIST_ADD(new_flow, env, phase);
+ axis2_array_list_add(new_flow, env, phase);
}
}
AXIS2_OP_SET_OUT_FLOW(make_conn_op, env, new_flow);
}
- size = AXIS2_ARRAY_LIST_SIZE(in_flow, env);
+ size = axis2_array_list_size(in_flow, env);
if(size > 0)
{
int i = 0;
axis2_array_list_t *new_flow = axis2_array_list_create(env, 0);
for(i = 0; i < size; i++)
{
- const axis2_phase_t *phase = AXIS2_ARRAY_LIST_GET(in_flow, env, i);
+ const axis2_phase_t *phase = axis2_array_list_get(in_flow, env, i);
const axis2_char_t *phase_name = AXIS2_PHASE_GET_NAME(phase, env);
if(0 == AXIS2_STRCMP(phase_name, "RMPhase"))
{
- AXIS2_ARRAY_LIST_ADD(new_flow, env, phase);
+ axis2_array_list_add(new_flow, env, phase);
}
}
AXIS2_OP_SET_IN_FLOW(make_conn_op, env, new_flow);
Modified: webservices/sandesha/trunk/c/src/util/property_bean.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_bean.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_bean.c Tue Mar 6 20:31:18 2007
@@ -75,17 +75,17 @@
{
if(bean->msg_types_to_drop)
{
- int count = AXIS2_ARRAY_LIST_SIZE(bean->msg_types_to_drop,
+ int count = axis2_array_list_size(bean->msg_types_to_drop,
env);
int i = 0;
for(i = 0; i < count; i++)
{
- int *msg_type = AXIS2_ARRAY_LIST_GET(
+ int *msg_type = axis2_array_list_get(
bean->msg_types_to_drop, env, i);
if(NULL != msg_type)
AXIS2_FREE(env->allocator, msg_type);
}
- AXIS2_ARRAY_LIST_FREE(bean->msg_types_to_drop, env);
+ axis2_array_list_free(bean->msg_types_to_drop, env);
}
if(bean->db_path)
{
@@ -301,7 +301,7 @@
if(!bean->msg_types_to_drop)
return AXIS2_FAILURE;
_msg_type = AXIS2_MALLOC(env->allocator, sizeof(int));
- AXIS2_ARRAY_LIST_ADD(bean->msg_types_to_drop, env, _msg_type);
+ axis2_array_list_add(bean->msg_types_to_drop, env, _msg_type);
return AXIS2_SUCCESS;
}
Modified: webservices/sandesha/trunk/c/src/util/property_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/property_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_mgr.c Tue Mar 6 20:31:18 2007
@@ -413,10 +413,10 @@
if(list)
{
int i = 0;
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(list, env); i++)
+ for(i = 0; i < axis2_array_list_size(list, env); i++)
{
axis2_char_t *val = NULL;
- val = AXIS2_ARRAY_LIST_GET(list, env, i);
+ val = axis2_array_list_get(list, env, i);
sandesha2_property_bean_add_msg_type_to_drop(property_bean, env,
atoi(val));
}
Modified: webservices/sandesha/trunk/c/src/util/sandesha2_utils.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/sandesha2_utils.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Tue Mar 6 20:31:18 2007
@@ -281,7 +281,7 @@
if(!sandesha2_utils_array_list_contains(env, ret, temp_str))
{
axis2_char_t *temp_element = AXIS2_STRDUP(temp_str, env);
- AXIS2_ARRAY_LIST_ADD(ret, env, temp_element);
+ axis2_array_list_add(ret, env, temp_element);
}
temp_str = strtok(NULL, ",");
}
@@ -300,9 +300,9 @@
AXIS2_PARAM_CHECK(env->error, list, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, str, AXIS2_FALSE);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(list, env); i++)
+ for(i = 0; i < axis2_array_list_size(list, env); i++)
{
- axis2_char_t *element = AXIS2_ARRAY_LIST_GET(list, env, i);
+ axis2_char_t *element = axis2_array_list_get(list, env, i);
if(element && 0 == AXIS2_STRCMP(element, str))
return AXIS2_TRUE;
}
@@ -322,19 +322,19 @@
AXIS2_PARAM_CHECK(env->error, list, NULL);
list_str = AXIS2_STRDUP("[", env);
- size = AXIS2_ARRAY_LIST_SIZE(list, env);
+ size = axis2_array_list_size(list, env);
for(i = 0; i < size; i++)
{
if(SANDESHA2_ARRAY_LIST_STRING == type)
{
- axis2_char_t *element = AXIS2_ARRAY_LIST_GET(list, env, i);
+ axis2_char_t *element = axis2_array_list_get(list, env, i);
if(0 == i)
list_str = axis2_strcat(env, list_str, element, NULL);
list_str = axis2_strcat(env, list_str, ",", element, NULL);
}
else if(SANDESHA2_ARRAY_LIST_LONG == type)
{
- long *element = AXIS2_ARRAY_LIST_GET(list, env, i);
+ long *element = axis2_array_list_get(list, env, i);
axis2_char_t value[32];
sprintf(value, "%ld", *element);
if(0 == i)
@@ -523,7 +523,7 @@
storage_mgr_list = AXIS2_PROPERTY_GET_VALUE(property, env);
sandesha2_storage_mgr_t *storage_mgr =
sandesha2_permanent_storage_mgr_create(env, conf_ctx);
- AXIS2_ARRAY_LIST_ADD(storage_mgr_list, env, storage_mgr);
+ axis2_array_list_add(storage_mgr_list, env, storage_mgr);
property = axis2_property_create_with_args(env, AXIS2_SCOPE_APPLICATION,
AXIS2_FALSE, 0, storage_mgr_list);
AXIS2_CTX_SET_PROPERTY(ctx, env, SANDESHA2_PERMANENT_STORAGE_MGR,
@@ -1065,10 +1065,10 @@
ack_ranges = axis2_array_list_create(env, 0);
sorted_msg_no_list = get_sorted_msg_no_list(env, msg_no_str, ",");
if(sorted_msg_no_list)
- size = AXIS2_ARRAY_LIST_SIZE(sorted_msg_no_list, env);
+ size = axis2_array_list_size(sorted_msg_no_list, env);
for(i = 0; i < size; i++)
{
- long *temp = AXIS2_ARRAY_LIST_GET(sorted_msg_no_list, env, i);
+ long *temp = axis2_array_list_get(sorted_msg_no_list, env, i);
if(lower == 0)
{
lower = *temp;
@@ -1087,7 +1087,7 @@
ack_range = sandesha2_ack_range_create(env, rm_ns_value, NULL);
sandesha2_ack_range_set_lower_value(ack_range, env, lower);
sandesha2_ack_range_set_upper_value(ack_range, env, upper);
- AXIS2_ARRAY_LIST_ADD(ack_ranges, env, ack_range);
+ axis2_array_list_add(ack_ranges, env, ack_range);
lower = *temp;
upper = *temp;
completed = AXIS2_FALSE;
@@ -1100,10 +1100,10 @@
ack_range = sandesha2_ack_range_create(env, rm_ns_value, NULL);
sandesha2_ack_range_set_lower_value(ack_range, env, lower);
sandesha2_ack_range_set_upper_value(ack_range, env, upper);
- AXIS2_ARRAY_LIST_ADD(ack_ranges, env, ack_range);
+ axis2_array_list_add(ack_ranges, env, ack_range);
completed = AXIS2_TRUE;
}
- /*AXIS2_ARRAY_LIST_FREE(sorted_msg_no_list, env);*/
+ /*axis2_array_list_free(sorted_msg_no_list, env);*/
return ack_ranges;
}
@@ -1126,11 +1126,11 @@
long *long_val = AXIS2_MALLOC(env->allocator, sizeof(long));
*long_val = atol(temp_str);
- AXIS2_ARRAY_LIST_ADD(msg_numbers, env, long_val);
+ axis2_array_list_add(msg_numbers, env, long_val);
temp_str = strtok(NULL, delim);
}
sorted_msg_no_list = sandesha2_utils_sort(env, msg_numbers);
- /*AXIS2_ARRAY_LIST_FREE(msg_numbers, env);*/
+ /*axis2_array_list_free(msg_numbers, env);*/
AXIS2_FREE(env->allocator, dup_str);
return sorted_msg_no_list;
}
@@ -1147,12 +1147,12 @@
sorted_list = axis2_array_list_create(env, 0);
if(list)
- size = AXIS2_ARRAY_LIST_SIZE(list, env);
+ size = axis2_array_list_size(list, env);
for(i = 0; i < size; i++)
{
long *temp_long = NULL;
- temp_long = (long *) AXIS2_ARRAY_LIST_GET(list, env, i);
+ temp_long = (long *) axis2_array_list_get(list, env, i);
if(*temp_long > max)
max = *temp_long;
}
@@ -1165,7 +1165,7 @@
for(i = 0; i < size; i++)
{
long *value = NULL;
- value = AXIS2_ARRAY_LIST_GET(list, env, i);
+ value = axis2_array_list_get(list, env, i);
if(*value == *temp)
{
contains = AXIS2_TRUE;
@@ -1174,7 +1174,7 @@
}
if(contains)
{
- AXIS2_ARRAY_LIST_ADD(sorted_list, env, temp);
+ axis2_array_list_add(sorted_list, env, temp);
}
}
return sorted_list;
@@ -1309,12 +1309,12 @@
{
ptr[0] = AXIS2_EOLN;
value = AXIS2_STRDUP(str, env);
- AXIS2_ARRAY_LIST_ADD(list, env, value);
+ axis2_array_list_add(list, env, value);
str = ptr + 3;
ptr = AXIS2_STRSTR(str, pattern);
}
value = AXIS2_STRDUP(str, env);
- AXIS2_ARRAY_LIST_ADD(list, env, value);
+ axis2_array_list_add(list, env, value);
return list;
}
Modified: webservices/sandesha/trunk/c/src/util/terminate_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/terminate_mgr.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Tue Mar 6 20:31:18 2007
@@ -166,12 +166,12 @@
sandesha2_invoker_bean_set_invoked(find_bean, env, AXIS2_TRUE);
found_list = sandesha2_invoker_mgr_find(invoker_mgr, env, find_bean);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(found_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(found_list, env); i++)
{
sandesha2_invoker_bean_t *map_bean = NULL;
axis2_char_t *msg_store_key = NULL;
- map_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
+ map_bean = axis2_array_list_get(found_list, env, i);
msg_store_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
(sandesha2_rm_bean_t *) map_bean, env);
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, msg_store_key);
@@ -231,10 +231,10 @@
found_list = sandesha2_next_msg_mgr_find(next_mgr, env, find_bean);
if(found_list)
- size = AXIS2_ARRAY_LIST_SIZE(found_list, env);
+ size = axis2_array_list_size(found_list, env);
for(i = 0; i < size; i++)
{
- sandesha2_next_msg_bean_t *bean = AXIS2_ARRAY_LIST_GET(found_list,
+ sandesha2_next_msg_bean_t *bean = axis2_array_list_get(found_list,
env, i);
if(bean)
{
@@ -297,12 +297,12 @@
if(all_seq_list)
{
int i = 0;
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(all_seq_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(all_seq_list, env); i++)
{
- axis2_char_t *value = AXIS2_ARRAY_LIST_GET(all_seq_list, env, i);
+ axis2_char_t *value = axis2_array_list_get(all_seq_list, env, i);
if(0 == axis2_strcmp(value, seq_id))
{
- AXIS2_ARRAY_LIST_REMOVE(all_seq_list, env, i);
+ axis2_array_list_remove(all_seq_list, env, i);
break;
}
}
@@ -319,12 +319,12 @@
if(found_list)
{
int i = 0, size = 0;
- size = AXIS2_ARRAY_LIST_SIZE(found_list, env);
+ size = axis2_array_list_size(found_list, env);
for(i = 0; i < size; i++)
{
sandesha2_seq_property_bean_t *seq_prop_bean = NULL;
- seq_prop_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
+ seq_prop_bean = axis2_array_list_get(found_list, env, i);
/*sandesha2_terminate_mgr_do_updates_if_needed(env, out_seq_id,
seq_prop_bean, seq_prop_mgr);*/
if(sandesha2_terminate_mgr_is_property_deletable(env,
@@ -532,13 +532,13 @@
if(found_list)
{
int i = 0;
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(found_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(found_list, env); i++)
{
sandesha2_sender_bean_t *retrans_bean = NULL;
axis2_char_t *msg_store_key = NULL;
axis2_char_t *msg_id = NULL;
- retrans_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
+ retrans_bean = axis2_array_list_get(found_list, env, i);
msg_id = sandesha2_sender_bean_get_msg_id((sandesha2_rm_bean_t *)
retrans_bean, env);
sandesha2_sender_mgr_remove(retrans_mgr, env, msg_id);
@@ -556,13 +556,13 @@
if(found_list)
{
int i = 0;
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(found_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(found_list, env); i++)
{
axis2_char_t *key = NULL;
axis2_char_t *msg_id = NULL;
sandesha2_create_seq_bean_t *create_seq_bean = NULL;
- create_seq_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
+ create_seq_bean = axis2_array_list_get(found_list, env, i);
key = sandesha2_create_seq_bean_get_ref_msg_store_key(
create_seq_bean, env);
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, key);
@@ -579,12 +579,12 @@
if(found_list)
{
int i = 0, size = 0;
- size = AXIS2_ARRAY_LIST_SIZE(found_list, env);
+ size = axis2_array_list_size(found_list, env);
for(i = 0; i < size; i++)
{
sandesha2_seq_property_bean_t *seq_prop_bean = NULL;
- seq_prop_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
+ seq_prop_bean = axis2_array_list_get(found_list, env, i);
sandesha2_terminate_mgr_do_updates_if_needed(env, out_seq_id,
seq_prop_bean, seq_prop_mgr);
if(sandesha2_terminate_mgr_is_property_deletable(env,
Modified: webservices/sandesha/trunk/c/src/workers/in_order_invoker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/in_order_invoker.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Tue Mar 6 20:31:18 2007
@@ -108,7 +108,7 @@
}
if(NULL != invoker->working_seqs)
{
- AXIS2_ARRAY_LIST_FREE(invoker->working_seqs, env);
+ axis2_array_list_free(invoker->working_seqs, env);
invoker->working_seqs = NULL;
}
AXIS2_FREE(env->allocator, invoker);
@@ -125,17 +125,17 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(invoker->working_seqs, env); i++)
+ for(i = 0; i < axis2_array_list_size(invoker->working_seqs, env); i++)
{
axis2_char_t *tmp_id = NULL;
- tmp_id = AXIS2_ARRAY_LIST_GET(invoker->working_seqs, env, i);
+ tmp_id = axis2_array_list_get(invoker->working_seqs, env, i);
if(0 == AXIS2_STRCMP(seq_id, tmp_id))
{
- AXIS2_ARRAY_LIST_REMOVE(invoker->working_seqs, env, i);
+ axis2_array_list_remove(invoker->working_seqs, env, i);
break;
}
}
- if(0 == AXIS2_ARRAY_LIST_SIZE(invoker->working_seqs, env))
+ if(0 == axis2_array_list_size(invoker->working_seqs, env))
invoker->run_invoker = AXIS2_FALSE;
return AXIS2_SUCCESS;
}
@@ -176,7 +176,7 @@
if(!sandesha2_utils_array_list_contains(env,
invoker->working_seqs, seq_id))
- AXIS2_ARRAY_LIST_ADD(invoker->working_seqs, env, seq_id);
+ axis2_array_list_add(invoker->working_seqs, env, seq_id);
if(!invoker->run_invoker)
{
invoker->conf_ctx = conf_ctx;
@@ -288,7 +288,7 @@
if(!all_seq_list)
continue;
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(all_seq_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(all_seq_list, env); i++)
{
axis2_char_t *seq_id = NULL;
long next_msg_no = -1;
@@ -299,7 +299,7 @@
int j = 0, size = 0;
axis2_bool_t continue_seq = AXIS2_TRUE;
- seq_id = AXIS2_ARRAY_LIST_GET(all_seq_list, env, i);
+ seq_id = axis2_array_list_get(all_seq_list, env, i);
sandesha2_transaction_commit(transaction, env);
transaction = sandesha2_storage_mgr_get_transaction(
storage_mgr, env);
@@ -310,7 +310,7 @@
axis2_char_t *str_list = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Next message not set"
" correctly. Removing invalid entry.");
- AXIS2_ARRAY_LIST_REMOVE(all_seq_list, env, i);
+ axis2_array_list_remove(all_seq_list, env, i);
/* We need to make sure we are not skipping element after
* removing current element
*/
@@ -335,7 +335,7 @@
next_msg_no, seq_id, AXIS2_FALSE);
st_map_list = sandesha2_invoker_mgr_find(storage_map_mgr,
env, find_bean);
- size = AXIS2_ARRAY_LIST_SIZE(st_map_list, env);
+ size = axis2_array_list_size(st_map_list, env);
for(j = 0; j < size; j++)
{
sandesha2_invoker_bean_t *st_map_bean = NULL;
@@ -348,7 +348,7 @@
axis2_msg_ctx_t *msg_ctx = NULL;
axis2_engine_t *engine = NULL;
- st_map_bean = AXIS2_ARRAY_LIST_GET(st_map_list, env, j);
+ st_map_bean = axis2_array_list_get(st_map_list, env, j);
key = sandesha2_invoker_bean_get_msg_ctx_ref_key(
(sandesha2_rm_bean_t *) st_map_bean, env);
printf("msg_ref_key:%s\n", key);
Modified: webservices/sandesha/trunk/c/src/workers/sender.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Tue Mar 6 20:31:18 2007
@@ -127,7 +127,7 @@
}
if(sender->working_seqs)
{
- AXIS2_ARRAY_LIST_FREE(sender->working_seqs, env);
+ axis2_array_list_free(sender->working_seqs, env);
sender->working_seqs = NULL;
}
AXIS2_FREE(env->allocator, sender);
@@ -144,17 +144,17 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(sender->working_seqs, env); i++)
+ for(i = 0; i < axis2_array_list_size(sender->working_seqs, env); i++)
{
axis2_char_t *tmp_id = NULL;
- tmp_id = AXIS2_ARRAY_LIST_GET(sender->working_seqs, env, i);
+ tmp_id = axis2_array_list_get(sender->working_seqs, env, i);
if(0 == AXIS2_STRCMP(seq_id, tmp_id))
{
- AXIS2_ARRAY_LIST_REMOVE(sender->working_seqs, env, i);
+ axis2_array_list_remove(sender->working_seqs, env, i);
break;
}
}
- if(0 == AXIS2_ARRAY_LIST_SIZE(sender->working_seqs, env))
+ if(0 == axis2_array_list_size(sender->working_seqs, env))
sender->run_sender = AXIS2_FALSE;
return AXIS2_SUCCESS;
}
@@ -193,7 +193,7 @@
if(seq_id && !sandesha2_utils_array_list_contains(env,
sender->working_seqs, seq_id))
- AXIS2_ARRAY_LIST_ADD(sender->working_seqs, env, seq_id);
+ axis2_array_list_add(sender->working_seqs, env, seq_id);
if(!sender->run_sender)
{
sender->conf_ctx = conf_ctx;
Modified: webservices/sandesha/trunk/c/src/workers/sender_worker.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/sender_worker.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender_worker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender_worker.c Tue Mar 6 20:31:18 2007
@@ -367,13 +367,13 @@
int j = 0;
axis2_bool_t continue_sending = AXIS2_FALSE;
- for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(msgs_not_to_send, env); j++)
+ for(j = 0; j < axis2_array_list_size(msgs_not_to_send, env); j++)
{
axis2_char_t *value = NULL;
int int_val = -1;
int msg_type = -1;
- value = AXIS2_ARRAY_LIST_GET(msgs_not_to_send, env, j);
+ value = axis2_array_list_get(msgs_not_to_send, env, j);
int_val = atoi(value);
msg_type = sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env);
if(msg_type == int_val)
Modified: webservices/sandesha/trunk/c/src/wsrm/rm_elements.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/rm_elements.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/rm_elements.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/rm_elements.c Tue Mar 6 20:31:18 2007
@@ -613,11 +613,11 @@
headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(
soap_header, env, SANDESHA2_SPEC_2005_02_NS_URI);
- if(headers && 0 < AXIS2_ARRAY_LIST_SIZE(headers, env))
+ if(headers && 0 < axis2_array_list_size(headers, env))
return SANDESHA2_SPEC_2005_02_NS_URI;
headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(
soap_header, env, SANDESHA2_SPEC_2006_08_NS_URI);
- if(headers && 0 < AXIS2_ARRAY_LIST_SIZE(headers, env))
+ if(headers && 0 < axis2_array_list_size(headers, env))
return SANDESHA2_SPEC_2006_08_NS_URI;
}
if(!action)
@@ -676,12 +676,12 @@
headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(
soap_header, env, AXIS2_WSA_NAMESPACE);
- if(headers && 0 < AXIS2_ARRAY_LIST_SIZE(headers, env))
+ if(headers && 0 < axis2_array_list_size(headers, env))
return AXIS2_WSA_NAMESPACE;
headers = AXIOM_SOAP_HEADER_GET_HEADER_BLOCKS_WITH_NAMESPACE_URI(
soap_header, env, AXIS2_WSA_NAMESPACE_SUBMISSION);
- if(headers && 0 < AXIS2_ARRAY_LIST_SIZE(headers, env))
+ if(headers && 0 < axis2_array_list_size(headers, env))
return AXIS2_WSA_NAMESPACE_SUBMISSION;
soap_header_node = AXIOM_SOAP_HEADER_GET_BASE_NODE(soap_header, env);
Modified: webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_ack.c?view=diff&rev=515446&r1=515445&r2=515446
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Tue Mar 6 20:31:18 2007
@@ -167,12 +167,12 @@
if(NULL != seq_ack_impl->ack_range_list)
{
- AXIS2_ARRAY_LIST_FREE(seq_ack_impl->ack_range_list, env);
+ axis2_array_list_free(seq_ack_impl->ack_range_list, env);
seq_ack_impl->ack_range_list = NULL;
}
if(NULL != seq_ack_impl->nack_list)
{
- AXIS2_ARRAY_LIST_FREE(seq_ack_impl->nack_list, env);
+ axis2_array_list_free(seq_ack_impl->nack_list, env);
seq_ack_impl->nack_list = NULL;
}
if(NULL != seq_ack_impl->seq_ack.part.ops)
@@ -261,7 +261,7 @@
}
if(sandesha2_iom_rm_element_from_om_node
((sandesha2_iom_rm_element_t *)ack_range, env, ack_node))
- AXIS2_ARRAY_LIST_ADD(seq_ack_impl->ack_range_list, env,
+ axis2_array_list_add(seq_ack_impl->ack_range_list, env,
ack_range);
}
}
@@ -291,7 +291,7 @@
}
sandesha2_iom_rm_element_from_om_node((sandesha2_iom_rm_element_t *)
nack, env, nack_node);
- AXIS2_ARRAY_LIST_ADD(seq_ack_impl->nack_list, env, nack);
+ axis2_array_list_add(seq_ack_impl->nack_list, env, nack);
}
}
rm_spec_ver = sandesha2_spec_specific_consts_get_spec_ver_str(env,
@@ -392,25 +392,25 @@
seq_ack_impl->must_understand);
sa_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(sa_block, env);
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)seq_ack_impl->identifier, env, sa_node);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(seq_ack_impl->ack_range_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(seq_ack_impl->ack_range_list, env); i++)
{
sandesha2_ack_range_t *ack_range = NULL;
- ack_range = (sandesha2_ack_range_t*)AXIS2_ARRAY_LIST_GET(
+ ack_range = (sandesha2_ack_range_t*)axis2_array_list_get(
seq_ack_impl->ack_range_list, env, i);
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)ack_range, env, sa_node);
}
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(seq_ack_impl->nack_list, env); i++)
+ for(i = 0; i < axis2_array_list_size(seq_ack_impl->nack_list, env); i++)
{
sandesha2_nack_t *nack = NULL;
- nack = (sandesha2_nack_t*)AXIS2_ARRAY_LIST_GET(
+ nack = (sandesha2_nack_t*)axis2_array_list_get(
seq_ack_impl->nack_list, env, i);
sandesha2_iom_rm_element_to_om_node((sandesha2_iom_rm_element_t *)nack, env, sa_node);
}
rm_spec_ver = sandesha2_spec_specific_consts_get_spec_ver_str(env,
seq_ack_impl->ns_val);
- if(NULL == seq_ack_impl->ack_none && 0 == AXIS2_ARRAY_LIST_SIZE(
+ if(NULL == seq_ack_impl->ack_none && 0 == axis2_array_list_size(
seq_ack_impl->ack_range_list, env) &&
- 0 == AXIS2_ARRAY_LIST_SIZE(seq_ack_impl->nack_list, env)
+ 0 == axis2_array_list_size(seq_ack_impl->nack_list, env)
&& AXIS2_TRUE ==
sandesha2_spec_specific_consts_is_ack_none_allowed(env,
rm_spec_ver))
@@ -425,9 +425,9 @@
if(NULL != seq_ack_impl->ack_none)
{
if(AXIS2_TRUE != sandesha2_spec_specific_consts_is_ack_none_allowed(env,
- rm_spec_ver) || 0 != AXIS2_ARRAY_LIST_SIZE(
+ rm_spec_ver) || 0 != axis2_array_list_size(
seq_ack_impl->ack_range_list, env) || 0 !=
- AXIS2_ARRAY_LIST_SIZE(seq_ack_impl->nack_list, env))
+ axis2_array_list_size(seq_ack_impl->nack_list, env))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_ACK_NONE_NOT_ALLOWED,
AXIS2_FAILURE);
@@ -442,7 +442,7 @@
if(NULL != seq_ack_impl->ack_final)
{
if(AXIS2_TRUE != sandesha2_spec_specific_consts_is_ack_final_allowed(
- env, rm_spec_ver) || 0 != AXIS2_ARRAY_LIST_SIZE(
+ env, rm_spec_ver) || 0 != axis2_array_list_size(
seq_ack_impl->nack_list, env))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_ACK_FINAL_NOT_ALLOWED,
@@ -558,7 +558,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
seq_ack_impl = SANDESHA2_INTF_TO_IMPL(seq_ack);
- AXIS2_ARRAY_LIST_ADD(seq_ack_impl->ack_range_list, env, ack_range);
+ axis2_array_list_add(seq_ack_impl->ack_range_list, env, ack_range);
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org