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 da...@apache.org on 2006/11/10 10:51:10 UTC
svn commit: r473292 [6/6] - in /webservices/sandesha/trunk/c: include/
src/client/ src/core/ src/handlers/ src/msgprocessors/ src/storage/beans/
src/storage/inmemory/ src/util/ src/workers/ src/wsrm/
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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Fri Nov 10 01:51:08 2006
@@ -34,12 +34,10 @@
* @brief In Order Invoker struct impl
* Sandesha2 In Order Invoker
*/
-typedef struct sandesha2_in_order_invoker_impl sandesha2_in_order_invoker_impl_t;
typedef struct sandesha2_in_order_invoker_args sandesha2_in_order_invoker_args_t;
-struct sandesha2_in_order_invoker_impl
+struct sandesha2_in_order_invoker_t
{
- sandesha2_in_order_invoker_t invoker;
axis2_conf_ctx_t *conf_ctx;
axis2_bool_t run_invoker;
axis2_array_list_t *working_seqs;
@@ -48,100 +46,36 @@
struct sandesha2_in_order_invoker_args
{
- sandesha2_in_order_invoker_impl_t *impl;
+ sandesha2_in_order_invoker_t *impl;
axis2_env_t *env;
};
-#define SANDESHA2_INTF_TO_IMPL(invoker) \
- ((sandesha2_in_order_invoker_impl_t *)(invoker))
-
-/***************************** Function headers *******************************/
-axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_stop_invoker_for_seq
- (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env, axis2_char_t *seq_id);
-
-axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_stop_invoking (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_in_order_invoker_is_invoker_started
- (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_run_invoker_for_seq
- (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env, axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *seq_id);
-
-axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_run (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_make_msg_ready_for_reinjection(
- sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env, axis2_msg_ctx_t *msg_ctx);
-
-void * AXIS2_THREAD_FUNC
-sandesha2_in_order_invoker_worker_func(axis2_thread_t *thd, void *data);
-
-axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_free(sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env);
-
-/***************************** End of function headers ************************/
-
AXIS2_EXTERN sandesha2_in_order_invoker_t* AXIS2_CALL
sandesha2_in_order_invoker_create(const axis2_env_t *env)
{
- sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
+ sandesha2_in_order_invoker_t *invoker = NULL;
AXIS2_ENV_CHECK(env, NULL);
- invoker_impl = (sandesha2_in_order_invoker_impl_t *)AXIS2_MALLOC
+ invoker = (sandesha2_in_order_invoker_t *)AXIS2_MALLOC
(env->allocator,
- sizeof(sandesha2_in_order_invoker_impl_t));
+ sizeof(sandesha2_in_order_invoker_t));
- if(NULL == invoker_impl)
+ if(NULL == invoker)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- invoker_impl->conf_ctx = NULL;
- invoker_impl->run_invoker = AXIS2_FALSE;
- invoker_impl->working_seqs = NULL;
- invoker_impl->mutex = NULL;
- invoker_impl->invoker.ops = NULL;
-
- invoker_impl->invoker.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_in_order_invoker_ops_t));
- if(NULL == invoker_impl->invoker.ops)
- {
- sandesha2_in_order_invoker_free(
- (sandesha2_in_order_invoker_t*)invoker_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
+ invoker->conf_ctx = NULL;
+ invoker->run_invoker = AXIS2_FALSE;
+ invoker->working_seqs = NULL;
+ invoker->mutex = NULL;
- invoker_impl->working_seqs = axis2_array_list_create(env,
+ invoker->working_seqs = axis2_array_list_create(env,
AXIS2_ARRAY_LIST_DEFAULT_CAPACITY);
- invoker_impl->mutex = axis2_thread_mutex_create(env->allocator,
+ invoker->mutex = axis2_thread_mutex_create(env->allocator,
AXIS2_THREAD_MUTEX_DEFAULT);
- invoker_impl->invoker.ops->stop_invoker_for_seq =
- sandesha2_in_order_invoker_stop_invoker_for_seq;
- invoker_impl->invoker.ops->stop_invoking =
- sandesha2_in_order_invoker_stop_invoking;
- invoker_impl->invoker.ops->is_invoker_started =
- sandesha2_in_order_invoker_is_invoker_started;
- invoker_impl->invoker.ops->run_invoker_for_seq =
- sandesha2_in_order_invoker_run_invoker_for_seq;
- invoker_impl->invoker.ops->run = sandesha2_in_order_invoker_run;
- invoker_impl->invoker.ops->free = sandesha2_in_order_invoker_free;
-
- return &(invoker_impl->invoker);
+ return invoker;
}
axis2_status_t AXIS2_CALL
@@ -157,108 +91,95 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_free(sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env)
+sandesha2_in_order_invoker_free(
+ sandesha2_in_order_invoker_t *invoker,
+ const axis2_env_t *env)
{
- sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
/* Do not free this */
- invoker_impl->conf_ctx = NULL;
+ invoker->conf_ctx = NULL;
- if(NULL != invoker_impl->mutex)
- {
- axis2_thread_mutex_destroy(invoker_impl->mutex);
- invoker_impl->mutex = NULL;
- }
- if(NULL != invoker_impl->working_seqs)
+ if(NULL != invoker->mutex)
{
- AXIS2_ARRAY_LIST_FREE(invoker_impl->working_seqs, env);
- invoker_impl->working_seqs = NULL;
+ axis2_thread_mutex_destroy(invoker->mutex);
+ invoker->mutex = NULL;
}
- if(NULL != invoker->ops)
+ if(NULL != invoker->working_seqs)
{
- AXIS2_FREE(env->allocator, invoker->ops);
- invoker->ops = NULL;
+ AXIS2_ARRAY_LIST_FREE(invoker->working_seqs, env);
+ invoker->working_seqs = NULL;
}
- AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(invoker));
+ AXIS2_FREE(env->allocator, invoker);
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_stop_invoker_for_seq
- (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env, axis2_char_t *seq_id)
+sandesha2_in_order_invoker_stop_invoker_for_seq(
+ sandesha2_in_order_invoker_t *invoker,
+ const axis2_env_t *env, axis2_char_t *seq_id)
{
- sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
int i = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- for(i = 0; i < AXIS2_ARRAY_LIST_SIZE(invoker_impl->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_impl->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_impl->working_seqs, env, i);
+ AXIS2_ARRAY_LIST_REMOVE(invoker->working_seqs, env, i);
break;
}
}
- if(0 == AXIS2_ARRAY_LIST_SIZE(invoker_impl->working_seqs, env))
- invoker_impl->run_invoker = AXIS2_FALSE;
+ if(0 == AXIS2_ARRAY_LIST_SIZE(invoker->working_seqs, env))
+ invoker->run_invoker = AXIS2_FALSE;
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_stop_invoking (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env)
+sandesha2_in_order_invoker_stop_invoking (
+ sandesha2_in_order_invoker_t *invoker,
+ const axis2_env_t *env)
{
- sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- SANDESHA2_INTF_TO_IMPL(invoker)->run_invoker = AXIS2_FALSE;
+ invoker->run_invoker = AXIS2_FALSE;
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
-sandesha2_in_order_invoker_is_invoker_started
- (sandesha2_in_order_invoker_t *invoker,
- const axis2_env_t *env)
+sandesha2_in_order_invoker_is_invoker_started(
+ sandesha2_in_order_invoker_t *invoker,
+ const axis2_env_t *env)
{
axis2_bool_t started = AXIS2_FALSE;
- sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
- started = SANDESHA2_INTF_TO_IMPL(invoker)->run_invoker;
+ started = invoker->run_invoker;
return started;
}
axis2_status_t AXIS2_CALL
-sandesha2_in_order_invoker_run_invoker_for_seq (
+sandesha2_in_order_invoker_run_for_seq (
sandesha2_in_order_invoker_t *invoker,
const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx,
axis2_char_t *seq_id)
{
- sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, seq_id, AXIS2_FAILURE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
if(!sandesha2_utils_array_list_contains(env,
- invoker_impl->working_seqs, seq_id))
- AXIS2_ARRAY_LIST_ADD(invoker_impl->working_seqs, env, seq_id);
- if(!invoker_impl->run_invoker)
+ invoker->working_seqs, seq_id))
+ AXIS2_ARRAY_LIST_ADD(invoker->working_seqs, env, seq_id);
+ if(!invoker->run_invoker)
{
- invoker_impl->conf_ctx = conf_ctx;
- invoker_impl->run_invoker = AXIS2_TRUE;
+ invoker->conf_ctx = conf_ctx;
+ invoker->run_invoker = AXIS2_TRUE;
sandesha2_in_order_invoker_run(invoker, env);
}
return AXIS2_SUCCESS;
@@ -269,16 +190,13 @@
sandesha2_in_order_invoker_t *invoker,
const axis2_env_t *env)
{
- sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
axis2_thread_t *worker_thread = NULL;
sandesha2_in_order_invoker_args_t *args = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- invoker_impl = SANDESHA2_INTF_TO_IMPL(invoker);
-
args = AXIS2_MALLOC(env->allocator, sizeof(
sandesha2_in_order_invoker_args_t));
- args->impl = invoker_impl;
+ args->impl = invoker;
args->env = (axis2_env_t*)env;
worker_thread = AXIS2_THREAD_POOL_GET_THREAD(env->thread_pool,
sandesha2_in_order_invoker_worker_func, (void*)args);
@@ -326,17 +244,15 @@
axis2_thread_t *thd,
void *data)
{
- sandesha2_in_order_invoker_impl_t *invoker_impl = NULL;
sandesha2_in_order_invoker_t *invoker = NULL;
sandesha2_in_order_invoker_args_t *args;
axis2_env_t *env = NULL;
args = (sandesha2_in_order_invoker_args_t*)data;
env = args->env;
- invoker_impl = args->impl;
- invoker = (sandesha2_in_order_invoker_t*)invoker_impl;
+ invoker = args->impl;
- while(invoker_impl->run_invoker)
+ while(invoker->run_invoker)
{
sandesha2_transaction_t *transaction = NULL;
/* Use when transaction handling is done
@@ -351,8 +267,8 @@
AXIS2_SLEEP(1);
storage_mgr = sandesha2_utils_get_storage_mgr(env,
- invoker_impl->conf_ctx,
- AXIS2_CONF_CTX_GET_CONF(invoker_impl->conf_ctx, env));
+ invoker->conf_ctx,
+ AXIS2_CONF_CTX_GET_CONF(invoker->conf_ctx, env));
next_msg_mgr = sandesha2_storage_mgr_get_next_msg_mgr(
storage_mgr, env);
storage_map_mgr = sandesha2_storage_mgr_get_storage_map_mgr
@@ -361,13 +277,13 @@
storage_mgr, env);
transaction = sandesha2_storage_mgr_get_transaction(storage_mgr,
env);
- all_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr,
+ all_seq_bean = sandesha2_seq_property_mgr_retrieve(seq_prop_mgr,
env, SANDESHA2_SEQ_PROP_ALL_SEQS,
SANDESHA2_SEQ_PROP_INCOMING_SEQ_LIST);
if(!all_seq_bean)
continue;
all_seq_list = sandesha2_utils_get_array_list_from_string(env,
- SANDESHA2_SEQ_PROPERTY_BEAN_GET_VALUE(all_seq_bean, env));
+ sandesha2_seq_property_bean_get_value(all_seq_bean, env));
if(!all_seq_list)
continue;
@@ -386,7 +302,7 @@
SANDESHA2_TRANSACTION_COMMIT(transaction, env);
transaction = sandesha2_storage_mgr_get_transaction(
storage_mgr, env);
- next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE(
+ next_msg_bean = sandesha2_next_msg_mgr_retrieve(
next_msg_mgr, env, seq_id);
if(!next_msg_bean)
{
@@ -400,13 +316,13 @@
i--;
str_list = sandesha2_utils_array_list_to_string(env, all_seq_list,
SANDESHA2_ARRAY_LIST_STRING);
- SANDESHA2_SEQ_PROPERTY_BEAN_SET_VALUE(all_seq_bean, env,
+ sandesha2_seq_property_bean_set_value(all_seq_bean, env,
str_list);
- SANDESHA2_SEQ_PROPERTY_MGR_UPDATE(seq_prop_mgr, env,
+ sandesha2_seq_property_mgr_update(seq_prop_mgr, env,
all_seq_bean);
continue;
}
- next_msg_no = SANDESHA2_NEXT_MSG_BEAN_GET_NEXT_MSG_NO_TO_PROCESS(
+ next_msg_no = sandesha2_next_msg_bean_get_next_msg_no_to_process(
next_msg_bean, env);
if(next_msg_no < 0)
{
@@ -434,7 +350,7 @@
key = sandesha2_invoker_bean_get_msg_ctx_ref_key(st_map_bean,
env);
msg_to_invoke = sandesha2_storage_mgr_retrieve_msg_ctx(
- storage_mgr, env, key, invoker_impl->conf_ctx);
+ storage_mgr, env, key, invoker->conf_ctx);
if(msg_to_invoke)
rm_msg_ctx = sandesha2_msg_init_init_msg(env,
msg_to_invoke);
@@ -457,7 +373,7 @@
if(post_failure_str && 0 == AXIS2_STRCMP(
post_failure_str, SANDESHA2_VALUE_TRUE))
post_failure_invocation = AXIS2_TRUE;
- engine = axis2_engine_create(env, invoker_impl->conf_ctx);
+ engine = axis2_engine_create(env, invoker->conf_ctx);
if(AXIS2_TRUE == post_failure_invocation)
{
sandesha2_in_order_invoker_make_msg_ready_for_reinjection(
@@ -474,20 +390,20 @@
storage_mgr, env);
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, key);
msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(
- storage_mgr, env, key, invoker_impl->conf_ctx);
+ storage_mgr, env, key, invoker->conf_ctx);
if(msg_ctx)
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr,
env, key);
if(SANDESHA2_MSG_TYPE_APPLICATION ==
- SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env))
+ sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env))
{
sandesha2_seq_t *seq = NULL;
- seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
+ seq = (sandesha2_seq_t*)sandesha2_msg_ctx_get_msg_part(
rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ);
if(sandesha2_seq_get_last_msg(seq, env))
{
sandesha2_terminate_mgr_clean_recv_side_after_invocation(
- env, invoker_impl->conf_ctx, seq_id,
+ env, invoker->conf_ctx, seq_id,
storage_mgr);
/* we are done with current seq */
continue_seq = AXIS2_FALSE;
@@ -502,9 +418,9 @@
if(invoked)
{
next_msg_no++;
- SANDESHA2_NEXT_MSG_BEAN_SET_NEXT_MSG_NO_TO_PROCESS(next_msg_bean,
+ sandesha2_next_msg_bean_set_next_msg_no_to_process(next_msg_bean,
env, next_msg_no);
- SANDESHA2_NEXT_MSG_MGR_UPDATE(next_msg_mgr, env,
+ sandesha2_next_msg_mgr_update(next_msg_mgr, env,
next_msg_bean);
}
}
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=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Fri Nov 10 01:51:08 2006
@@ -419,7 +419,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, rm_msg_ctx, AXIS2_FAILURE);
- if(NULL != SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
+ if(NULL != sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT))
return AXIS2_TRUE;
@@ -496,13 +496,13 @@
mgr = sandesha2_storage_mgr_get_retrans_mgr(storage_mgr, env);
seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr(
storage_mgr, env);
- sender_bean = SANDESHA2_SENDER_MGR_GET_NEXT_MSG_TO_SEND(mgr, env);
+ sender_bean = sandesha2_sender_mgr_get_next_msg_to_send(mgr, env);
if(!sender_bean)
{
continue;
}
- key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(sender_bean, env);
+ key = sandesha2_sender_bean_get_msg_ctx_ref_key(sender_bean, env);
msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env, key,
sender_impl->conf_ctx);
if(!msg_ctx)
@@ -552,7 +552,7 @@
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);
+ msg_type = sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env);
if(msg_type == int_val)
continue_sending = AXIS2_TRUE;
}
@@ -563,7 +563,7 @@
* This method is not implemented yet
* update_msg(sender, env, msg_xtx);
*/
- msg_type = SANDESHA2_MSG_CTX_GET_MSG_TYPE(rm_msg_ctx, env);
+ msg_type = sandesha2_msg_ctx_get_msg_type(rm_msg_ctx, env);
if(msg_type == SANDESHA2_MSG_TYPE_APPLICATION)
{
sandesha2_seq_t *seq = NULL;
@@ -571,7 +571,7 @@
sandesha2_identifier_t *identifier = NULL;
seq = (sandesha2_seq_t*)
- SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx,
+ sandesha2_msg_ctx_get_msg_part(rm_msg_ctx,
env, SANDESHA2_MSG_PART_SEQ);
identifier = sandesha2_seq_get_identifier(seq, env);
seq_id = sandesha2_identifier_get_identifier(identifier, env);
@@ -616,29 +616,29 @@
SANDESHA2_VALUE_TRUE, env));
AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
SANDESHA2_WITHIN_TRANSACTION, property, AXIS2_FALSE);
- msg_id = SANDESHA2_SENDER_BEAN_GET_MSG_ID(sender_bean, env);
- bean1 = SANDESHA2_SENDER_MGR_RETRIEVE(mgr, env, msg_id);
+ msg_id = sandesha2_sender_bean_get_msg_id(sender_bean, env);
+ bean1 = sandesha2_sender_mgr_retrieve(mgr, env, msg_id);
if(bean1)
{
axis2_bool_t resend = AXIS2_FALSE;
- resend = SANDESHA2_SENDER_BEAN_IS_RESEND(sender_bean, env);
+ resend = sandesha2_sender_bean_is_resend(sender_bean, env);
if(AXIS2_TRUE == resend)
{
- SANDESHA2_SENDER_BEAN_SET_SENT_COUNT(bean1, env,
- SANDESHA2_SENDER_BEAN_GET_SENT_COUNT(sender_bean, env));
- SANDESHA2_SENDER_BEAN_SET_TIME_TO_SEND(bean1, env,
- SANDESHA2_SENDER_BEAN_GET_TIME_TO_SEND(sender_bean, env));
- SANDESHA2_SENDER_MGR_UPDATE(mgr, env, bean1);
+ sandesha2_sender_bean_set_sent_count(bean1, env,
+ sandesha2_sender_bean_get_sent_count(sender_bean, env));
+ sandesha2_sender_bean_set_time_to_send(bean1, env,
+ sandesha2_sender_bean_get_time_to_send(sender_bean, env));
+ sandesha2_sender_mgr_update(mgr, env, bean1);
}
else
{
axis2_char_t *msg_stored_key = NULL;
- msg_id = SANDESHA2_SENDER_BEAN_GET_MSG_ID(bean1, env);
- SANDESHA2_SENDER_MGR_REMOVE(mgr, env, msg_id);
+ msg_id = sandesha2_sender_bean_get_msg_id(bean1, env);
+ sandesha2_sender_mgr_remove(mgr, env, msg_id);
/* Removing the message from the storage */
- msg_stored_key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(
+ msg_stored_key = sandesha2_sender_bean_get_msg_ctx_ref_key(
bean1, env);
sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env,
msg_stored_key);
@@ -649,7 +649,7 @@
if(AXIS2_FALSE == AXIS2_MSG_CTX_GET_SERVER_SIDE(msg_ctx, env))
sandesha2_sender_check_for_sync_res(sender, env, msg_ctx);
}
- if(SANDESHA2_MSG_TYPE_TERMINATE_SEQ == SANDESHA2_MSG_CTX_GET_MSG_TYPE(
+ if(SANDESHA2_MSG_TYPE_TERMINATE_SEQ == sandesha2_msg_ctx_get_msg_type(
rm_msg_ctx, env))
{
sandesha2_terminate_seq_t *terminate_seq = NULL;
@@ -658,7 +658,7 @@
axis2_char_t *int_seq_id = NULL;
terminate_seq = (sandesha2_terminate_seq_t*)
- SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
+ sandesha2_msg_ctx_get_msg_part(rm_msg_ctx, env,
SANDESHA2_MSG_PART_TERMINATE_SEQ);
seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
Modified: webservices/sandesha/trunk/c/src/wsrm/ack_requested.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_requested.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_requested.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_requested.c Fri Nov 10 01:51:08 2006
@@ -19,15 +19,14 @@
#include <axiom_soap_header_block.h>
#include <sandesha2_constants.h>
+typedef struct sandesha2_ack_requested_impl sandesha2_ack_requested_impl_t;
/**
* @brief AckRequested struct impl
* Sandesha2 IOM AckRequested
*/
-typedef struct sandesha2_ack_requested_impl sandesha2_ack_requested_impl_t;
-
struct sandesha2_ack_requested_impl
{
- sandesha2_ack_requested_t ack_requested;
+ sandesha2_ack_requested_t ack_requested;
sandesha2_identifier_t *identifier;
sandesha2_msg_number_t *msg_num;
axis2_bool_t must_understand;
@@ -37,61 +36,29 @@
#define SANDESHA2_INTF_TO_IMPL(ack_requested) \
((sandesha2_ack_requested_impl_t *)(ack_requested))
-/***************************** Function headers *******************************/
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_ack_requested_get_namespace_value (
sandesha2_iom_rm_element_t *ack_requested,
const axis2_env_t *env);
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_ack_requested_from_om_node(sandesha2_iom_rm_element_t *ack_requested,
const axis2_env_t *env, axiom_node_t *om_node);
-axiom_node_t* AXIS2_CALL
+static axiom_node_t* AXIS2_CALL
sandesha2_ack_requested_to_om_node(sandesha2_iom_rm_element_t *element,
const axis2_env_t *env, void *om_node);
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_ack_requested_is_namespace_supported(
sandesha2_iom_rm_element_t *ack_requested,
const axis2_env_t *env, axis2_char_t *namespace);
-sandesha2_identifier_t * AXIS2_CALL
-sandesha2_ack_requested_get_identifier(
- sandesha2_ack_requested_t *ack_requested,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_ack_requested_set_identifier(
- sandesha2_ack_requested_t *ack_requested,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-
-sandesha2_msg_number_t * AXIS2_CALL
-sandesha2_ack_requested_get_msg_number(sandesha2_ack_requested_t *element,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_ack_requested_set_msg_number(
- sandesha2_ack_requested_t *ack_requested,
- const axis2_env_t *env,
- sandesha2_msg_number_t *msg_number);
-
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_ack_requested_to_soap_env(sandesha2_iom_rm_part_t *ack_requested,
const axis2_env_t *env, axiom_soap_envelope_t *envelope);
-axis2_bool_t AXIS2_CALL
-sandesha2_ack_requested_is_must_understand(
- sandesha2_ack_requested_t *ack_requested,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_ack_requested_set_must_understand(
- sandesha2_ack_requested_t *ack_requested,
- const axis2_env_t *env, axis2_bool_t mu);
-
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_ack_requested_free (sandesha2_iom_rm_element_t *ack_requested,
const axis2_env_t *env);
@@ -123,19 +90,9 @@
ack_requested_impl->identifier = NULL;
ack_requested_impl->msg_num = NULL;
ack_requested_impl->must_understand = AXIS2_FALSE;
- ack_requested_impl->ack_requested.ops = NULL;
ack_requested_impl->ack_requested.part.ops = NULL;
ack_requested_impl->ack_requested.part.element.ops = NULL;
- ack_requested_impl->ack_requested.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_ack_requested_ops_t));
- if(NULL == ack_requested_impl->ack_requested.ops)
- {
- sandesha2_ack_requested_free((sandesha2_iom_rm_element_t*)
- ack_requested_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
ack_requested_impl->ack_requested.part.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_part_ops_t));
if(NULL == ack_requested_impl->ack_requested.part.ops)
@@ -166,18 +123,6 @@
sandesha2_ack_requested_is_namespace_supported;
ack_requested_impl->ack_requested.part.ops->to_soap_env =
sandesha2_ack_requested_to_soap_env;
- ack_requested_impl->ack_requested.ops->set_identifier =
- sandesha2_ack_requested_set_identifier;
- ack_requested_impl->ack_requested.ops->get_identifier =
- sandesha2_ack_requested_get_identifier;
- ack_requested_impl->ack_requested.ops->set_msg_number =
- sandesha2_ack_requested_set_msg_number;
- ack_requested_impl->ack_requested.ops->get_msg_number =
- sandesha2_ack_requested_get_msg_number;
- ack_requested_impl->ack_requested.ops->set_must_understand =
- sandesha2_ack_requested_set_must_understand;
- ack_requested_impl->ack_requested.ops->is_must_understand =
- sandesha2_ack_requested_is_must_understand;
ack_requested_impl->ack_requested.part.element.ops->free =
sandesha2_ack_requested_free;
@@ -185,7 +130,7 @@
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_ack_requested_free (sandesha2_iom_rm_element_t *ack_requested,
const axis2_env_t *env)
{
@@ -193,7 +138,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
ack_requested_impl = SANDESHA2_INTF_TO_IMPL(ack_requested);
- if(NULL != ack_requested_impl->ns_val)
+ if(ack_requested_impl->ns_val)
{
AXIS2_FREE(env->allocator, ack_requested_impl->ns_val);
ack_requested_impl->ns_val = NULL;
@@ -201,17 +146,7 @@
ack_requested_impl->identifier = NULL;
ack_requested_impl->msg_num = NULL;
- if(NULL != ack_requested->ops)
- {
- AXIS2_FREE(env->allocator, ack_requested->ops);
- ack_requested->ops = NULL;
- }
- if(NULL != ack_requested_impl->ack_requested.ops)
- {
- AXIS2_FREE(env->allocator, ack_requested_impl->ack_requested.ops);
- ack_requested_impl->ack_requested.ops = NULL;
- }
- if(NULL != ack_requested_impl->ack_requested.part.ops)
+ if(ack_requested_impl->ack_requested.part.ops)
{
AXIS2_FREE(env->allocator, ack_requested_impl->ack_requested.part.ops);
ack_requested_impl->ack_requested.part.ops = NULL;
@@ -220,7 +155,7 @@
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_ack_requested_get_namespace_value (
sandesha2_iom_rm_element_t *ack_requested,
const axis2_env_t *env)
@@ -233,7 +168,7 @@
}
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_ack_requested_from_om_node(sandesha2_iom_rm_element_t *ack_requested,
const axis2_env_t *env, axiom_node_t *om_node)
{
@@ -303,7 +238,7 @@
}
-axiom_node_t* AXIS2_CALL
+static axiom_node_t* AXIS2_CALL
sandesha2_ack_requested_to_om_node(
sandesha2_iom_rm_element_t *ack_requested,
const axis2_env_t *env,
@@ -347,7 +282,7 @@
return ar_node;
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_ack_requested_is_namespace_supported(
sandesha2_iom_rm_element_t *ack_requested,
const axis2_env_t *env, axis2_char_t *namespace)
@@ -367,6 +302,37 @@
return AXIS2_FALSE;
}
+static axis2_status_t AXIS2_CALL
+sandesha2_ack_requested_to_soap_env(
+ sandesha2_iom_rm_part_t *ack_requested,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *envelope)
+{
+ sandesha2_ack_requested_impl_t *ack_requested_impl = NULL;
+ axiom_soap_header_t *soap_header = NULL;
+ axis2_qname_t *requested_qname = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, envelope, AXIS2_FAILURE);
+
+ ack_requested_impl = SANDESHA2_INTF_TO_IMPL(ack_requested);
+ soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(envelope, env);
+ /**
+ * Remove if header block exists
+ */
+ requested_qname = axis2_qname_create(env,
+ SANDESHA2_WSRM_COMMON_ACK_REQUESTED,
+ ack_requested_impl->ns_val, NULL);
+ if(NULL == requested_qname)
+ {
+ return AXIS2_FAILURE;
+ }
+ AXIOM_SOAP_HEADER_REMOVE_HEADER_BLOCK(soap_header, env, requested_qname);
+ sandesha2_ack_requested_to_om_node((sandesha2_iom_rm_element_t*)
+ ack_requested, env, soap_header);
+ return AXIS2_SUCCESS;
+}
+
sandesha2_identifier_t * AXIS2_CALL
sandesha2_ack_requested_get_identifier(sandesha2_ack_requested_t *ack_requested,
const axis2_env_t *env)
@@ -454,33 +420,3 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
-sandesha2_ack_requested_to_soap_env(
- sandesha2_iom_rm_part_t *ack_requested,
- const axis2_env_t *env,
- axiom_soap_envelope_t *envelope)
-{
- sandesha2_ack_requested_impl_t *ack_requested_impl = NULL;
- axiom_soap_header_t *soap_header = NULL;
- axis2_qname_t *requested_qname = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, envelope, AXIS2_FAILURE);
-
- ack_requested_impl = SANDESHA2_INTF_TO_IMPL(ack_requested);
- soap_header = AXIOM_SOAP_ENVELOPE_GET_HEADER(envelope, env);
- /**
- * Remove if header block exists
- */
- requested_qname = axis2_qname_create(env,
- SANDESHA2_WSRM_COMMON_ACK_REQUESTED,
- ack_requested_impl->ns_val, NULL);
- if(NULL == requested_qname)
- {
- return AXIS2_FAILURE;
- }
- AXIOM_SOAP_HEADER_REMOVE_HEADER_BLOCK(soap_header, env, requested_qname);
- sandesha2_ack_requested_to_om_node((sandesha2_iom_rm_element_t*)
- ack_requested, env, soap_header);
- return AXIS2_SUCCESS;
-}
Modified: webservices/sandesha/trunk/c/src/wsrm/acks_to.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/acks_to.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/acks_to.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/acks_to.c Fri Nov 10 01:51:08 2006
@@ -49,16 +49,7 @@
axis2_bool_t AXIS2_CALL
sandesha2_acks_to_is_namespace_supported(sandesha2_iom_rm_element_t *acks_to,
const axis2_env_t *env, axis2_char_t *namespace);
-
-sandesha2_address_t * AXIS2_CALL
-sandesha2_acks_to_get_address(sandesha2_acks_to_t *acks_to,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_acks_to_set_address (sandesha2_acks_to_t *acks_to,
- const axis2_env_t *env,
- sandesha2_address_t *address);
-
+
axis2_status_t AXIS2_CALL
sandesha2_acks_to_free (sandesha2_iom_rm_element_t *acks_to,
const axis2_env_t *env);
@@ -93,7 +84,6 @@
acks_to_impl->rm_ns_val = NULL;
acks_to_impl->addr_ns_val = NULL;
acks_to_impl->address = NULL;
- acks_to_impl->acks_to.ops = NULL;
acks_to_impl->acks_to.element.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_element_ops_t));
@@ -105,16 +95,6 @@
return NULL;
}
- acks_to_impl->acks_to.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_iom_rm_element_ops_t));
- if(NULL == acks_to_impl->acks_to.ops)
- {
- sandesha2_acks_to_free((sandesha2_iom_rm_element_t*)
- acks_to_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
acks_to_impl->rm_ns_val = (axis2_char_t *)AXIS2_STRDUP(rm_ns_val, env);
acks_to_impl->addr_ns_val = (axis2_char_t *)AXIS2_STRDUP(addr_ns_val, env);
acks_to_impl->address = address;
@@ -127,8 +107,6 @@
sandesha2_acks_to_to_om_node;
acks_to_impl->acks_to.element.ops->is_namespace_supported =
sandesha2_acks_to_is_namespace_supported;
- acks_to_impl->acks_to.ops->get_address = sandesha2_acks_to_get_address;
- acks_to_impl->acks_to.ops->set_address = sandesha2_acks_to_set_address;
acks_to_impl->acks_to.element.ops->free = sandesha2_acks_to_free;
return &(acks_to_impl->acks_to);
@@ -143,26 +121,21 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
acks_to_impl = SANDESHA2_INTF_TO_IMPL(acks_to);
- if(NULL != acks_to_impl->addr_ns_val)
+ if(acks_to_impl->addr_ns_val)
{
AXIS2_FREE(env->allocator, acks_to_impl->addr_ns_val);
acks_to_impl->addr_ns_val = NULL;
}
- if(NULL != acks_to_impl->rm_ns_val)
+ if(acks_to_impl->rm_ns_val)
{
AXIS2_FREE(env->allocator, acks_to_impl->rm_ns_val);
acks_to_impl->rm_ns_val = NULL;
}
acks_to_impl->address = NULL;
- if(NULL != acks_to_impl->acks_to.element.ops)
+ if(acks_to_impl->acks_to.element.ops)
{
AXIS2_FREE(env->allocator, acks_to_impl->acks_to.element.ops);
acks_to_impl->acks_to.element.ops = NULL;
- }
- if(NULL != acks_to->ops)
- {
- AXIS2_FREE(env->allocator, acks_to->ops);
- acks_to->ops = NULL;
}
AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(acks_to));
Modified: webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_fault.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_fault.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_fault.c Fri Nov 10 01:51:08 2006
@@ -35,33 +35,24 @@
((sandesha2_seq_fault_impl_t *)(seq_fault))
/***************************** Function headers *******************************/
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_seq_fault_get_namespace_value (sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env);
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_seq_fault_from_om_node(sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env, axiom_node_t *om_node);
-axiom_node_t* AXIS2_CALL
+static axiom_node_t* AXIS2_CALL
sandesha2_seq_fault_to_om_node(sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env, void *om_node);
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_seq_fault_is_namespace_supported(
sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env, axis2_char_t *namespace);
-sandesha2_fault_code_t * AXIS2_CALL
-sandesha2_seq_fault_get_fault_code(sandesha2_seq_fault_t *seq_fault,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_seq_fault_set_fault_code(sandesha2_seq_fault_t *seq_fault,
- const axis2_env_t *env,
- sandesha2_fault_code_t *fault_code);
-
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_seq_fault_free (sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env);
@@ -92,18 +83,8 @@
}
seq_fault_impl->ns_val = NULL;
seq_fault_impl->fault_code = NULL;
- seq_fault_impl->seq_fault.ops = NULL;
seq_fault_impl->seq_fault.element.ops = NULL;
- seq_fault_impl->seq_fault.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_fault_ops_t));
- if(NULL == seq_fault_impl->seq_fault.ops)
- {
- sandesha2_seq_fault_free((sandesha2_iom_rm_element_t*)
- seq_fault_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
seq_fault_impl->seq_fault.element.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_element_ops_t));
if(NULL == seq_fault_impl->seq_fault.element.ops)
@@ -123,17 +104,13 @@
sandesha2_seq_fault_to_om_node;
seq_fault_impl->seq_fault.element.ops->is_namespace_supported =
sandesha2_seq_fault_is_namespace_supported;
- seq_fault_impl->seq_fault.ops->set_fault_code =
- sandesha2_seq_fault_set_fault_code;
- seq_fault_impl->seq_fault.ops->get_fault_code =
- sandesha2_seq_fault_get_fault_code;
seq_fault_impl->seq_fault.element.ops->free = sandesha2_seq_fault_free;
return &(seq_fault_impl->seq_fault);
}
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_seq_fault_free (sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env)
{
@@ -141,26 +118,16 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
seq_fault_impl = SANDESHA2_INTF_TO_IMPL(seq_fault);
- if(NULL != seq_fault_impl->ns_val)
+ if(seq_fault_impl->ns_val)
{
AXIS2_FREE(env->allocator, seq_fault_impl->ns_val);
seq_fault_impl->ns_val = NULL;
}
- if(NULL != seq_fault->ops)
- {
- AXIS2_FREE(env->allocator, seq_fault->ops);
- seq_fault->ops = NULL;
- }
- if(NULL != seq_fault_impl->seq_fault.ops)
- {
- AXIS2_FREE(env->allocator, seq_fault_impl->seq_fault.ops);
- seq_fault_impl->seq_fault.ops = NULL;
- }
AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(seq_fault));
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_seq_fault_get_namespace_value (sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env)
{
@@ -172,7 +139,7 @@
}
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_seq_fault_from_om_node(sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env, axiom_node_t *om_node)
{
@@ -233,7 +200,7 @@
}
-axiom_node_t* AXIS2_CALL
+static axiom_node_t* AXIS2_CALL
sandesha2_seq_fault_to_om_node(sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env, void *om_node)
{
@@ -267,7 +234,7 @@
return (axiom_node_t*)om_node;
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_seq_fault_is_namespace_supported(
sandesha2_iom_rm_element_t *seq_fault,
const axis2_env_t *env, axis2_char_t *namespace)
Modified: webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_offer.c?view=diff&rev=473292&r1=473291&r2=473292
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_offer.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_offer.c Fri Nov 10 01:51:08 2006
@@ -25,7 +25,7 @@
struct sandesha2_seq_offer_impl
{
- sandesha2_seq_offer_t seq_offer;
+ sandesha2_seq_offer_t seq_offer;
sandesha2_identifier_t *identifier;
sandesha2_expires_t *expires;
axis2_char_t *ns_val;
@@ -35,48 +35,33 @@
((sandesha2_seq_offer_impl_t *)(seq_offer))
/***************************** Function headers *******************************/
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_seq_offer_get_namespace_value (sandesha2_iom_rm_element_t *seq_offer,
const axis2_env_t *env);
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_seq_offer_from_om_node(sandesha2_iom_rm_element_t *seq_offer,
const axis2_env_t *env, axiom_node_t *om_node);
-axiom_node_t* AXIS2_CALL
+static axiom_node_t* AXIS2_CALL
sandesha2_seq_offer_to_om_node(sandesha2_iom_rm_element_t *seq_offer,
const axis2_env_t *env, void *om_node);
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_seq_offer_is_namespace_supported(
sandesha2_iom_rm_element_t *seq_offer,
const axis2_env_t *env, axis2_char_t *namespace);
-sandesha2_identifier_t * AXIS2_CALL
-sandesha2_seq_offer_get_identifier(sandesha2_seq_offer_t *seq_offer,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_seq_offer_set_identifier(sandesha2_seq_offer_t *seq_offer,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-
-sandesha2_expires_t * AXIS2_CALL
-sandesha2_seq_offer_get_expires(sandesha2_seq_offer_t *seq_offer,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_seq_offer_set_expires(sandesha2_seq_offer_t *seq_offer,
- const axis2_env_t *env, sandesha2_expires_t *expires);
-
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_seq_offer_free (sandesha2_iom_rm_element_t *seq_offer,
const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_seq_offer_t* AXIS2_CALL
-sandesha2_seq_offer_create(const axis2_env_t *env, axis2_char_t *ns_val)
+sandesha2_seq_offer_create(
+ const axis2_env_t *env,
+ axis2_char_t *ns_val)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -101,18 +86,8 @@
seq_offer_impl->ns_val = NULL;
seq_offer_impl->identifier = NULL;
seq_offer_impl->expires = NULL;
- seq_offer_impl->seq_offer.ops = NULL;
seq_offer_impl->seq_offer.element.ops = NULL;
- seq_offer_impl->seq_offer.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_seq_offer_ops_t));
- if(NULL == seq_offer_impl->seq_offer.ops)
- {
- sandesha2_seq_offer_free((sandesha2_iom_rm_element_t*)
- seq_offer_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
seq_offer_impl->seq_offer.element.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_element_ops_t));
if(NULL == seq_offer_impl->seq_offer.element.ops)
@@ -132,23 +107,16 @@
sandesha2_seq_offer_to_om_node;
seq_offer_impl->seq_offer.element.ops->is_namespace_supported =
sandesha2_seq_offer_is_namespace_supported;
- seq_offer_impl->seq_offer.ops->set_identifier =
- sandesha2_seq_offer_set_identifier;
- seq_offer_impl->seq_offer.ops->get_identifier =
- sandesha2_seq_offer_get_identifier;
- seq_offer_impl->seq_offer.ops->set_expires =
- sandesha2_seq_offer_set_expires;
- seq_offer_impl->seq_offer.ops->get_expires =
- sandesha2_seq_offer_get_expires;
seq_offer_impl->seq_offer.element.ops->free = sandesha2_seq_offer_free;
return &(seq_offer_impl->seq_offer);
}
-axis2_status_t AXIS2_CALL
-sandesha2_seq_offer_free (sandesha2_iom_rm_element_t *seq_offer,
- const axis2_env_t *env)
+static axis2_status_t AXIS2_CALL
+sandesha2_seq_offer_free (
+ sandesha2_iom_rm_element_t *seq_offer,
+ const axis2_env_t *env)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -161,11 +129,6 @@
}
seq_offer_impl->identifier = NULL;
seq_offer_impl->expires = NULL;
- if(NULL != seq_offer->ops)
- {
- AXIS2_FREE(env->allocator, seq_offer->ops);
- seq_offer->ops = NULL;
- }
if(NULL != seq_offer_impl->seq_offer.element.ops)
{
AXIS2_FREE(env->allocator, seq_offer_impl->seq_offer.element.ops);
@@ -175,9 +138,10 @@
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
-sandesha2_seq_offer_get_namespace_value (sandesha2_iom_rm_element_t *seq_offer,
- const axis2_env_t *env)
+static axis2_char_t* AXIS2_CALL
+sandesha2_seq_offer_get_namespace_value (
+ sandesha2_iom_rm_element_t *seq_offer,
+ const axis2_env_t *env)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -187,9 +151,11 @@
}
-void* AXIS2_CALL
-sandesha2_seq_offer_from_om_node(sandesha2_iom_rm_element_t *seq_offer,
- const axis2_env_t *env, axiom_node_t *om_node)
+static void* AXIS2_CALL
+sandesha2_seq_offer_from_om_node(
+ sandesha2_iom_rm_element_t *seq_offer,
+ const axis2_env_t *env,
+ axiom_node_t *om_node)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
axiom_element_t *om_element = NULL;
@@ -256,9 +222,10 @@
}
-axiom_node_t* AXIS2_CALL
-sandesha2_seq_offer_to_om_node(sandesha2_iom_rm_element_t *seq_offer,
- const axis2_env_t *env, void *om_node)
+static axiom_node_t* AXIS2_CALL
+sandesha2_seq_offer_to_om_node(
+ sandesha2_iom_rm_element_t *seq_offer,
+ const axis2_env_t *env, void *om_node)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
axiom_namespace_t *rm_ns = NULL;
@@ -298,10 +265,11 @@
return (axiom_node_t*)om_node;
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_seq_offer_is_namespace_supported(
- sandesha2_iom_rm_element_t *seq_offer,
- const axis2_env_t *env, axis2_char_t *namespace)
+ sandesha2_iom_rm_element_t *seq_offer,
+ const axis2_env_t *env,
+ axis2_char_t *namespace)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -319,8 +287,9 @@
}
sandesha2_identifier_t * AXIS2_CALL
-sandesha2_seq_offer_get_identifier(sandesha2_seq_offer_t *seq_offer,
- const axis2_env_t *env)
+sandesha2_seq_offer_get_identifier(
+ sandesha2_seq_offer_t *seq_offer,
+ const axis2_env_t *env)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -331,9 +300,10 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_seq_offer_set_identifier(sandesha2_seq_offer_t *seq_offer,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier)
+sandesha2_seq_offer_set_identifier(
+ sandesha2_seq_offer_t *seq_offer,
+ const axis2_env_t *env,
+ sandesha2_identifier_t *identifier)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -351,8 +321,9 @@
}
sandesha2_expires_t * AXIS2_CALL
-sandesha2_seq_offer_get_expires(sandesha2_seq_offer_t *seq_offer,
- const axis2_env_t *env)
+sandesha2_seq_offer_get_expires(
+ sandesha2_seq_offer_t *seq_offer,
+ const axis2_env_t *env)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -362,8 +333,9 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_seq_offer_set_expires(sandesha2_seq_offer_t *seq_offer,
- const axis2_env_t *env, sandesha2_expires_t *expires)
+sandesha2_seq_offer_set_expires(
+ sandesha2_seq_offer_t *seq_offer,
+ const axis2_env_t *env, sandesha2_expires_t *expires)
{
sandesha2_seq_offer_impl_t *seq_offer_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -372,3 +344,4 @@
seq_offer_impl->expires = expires;
return AXIS2_SUCCESS;
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org