You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by da...@apache.org on 2006/11/09 10:50:07 UTC
svn commit: r472834 [3/3] - in /webservices/sandesha/trunk/c: include/
src/client/ src/handlers/ src/msgprocessors/ src/storage/beans/
src/storage/inmemory/ src/util/ src/workers/ src/wsrm/
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_bean.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_bean.c Thu Nov 9 01:50:04 2006
@@ -23,277 +23,107 @@
* @brief Property Bean struct impl
* Sandesha2 Property Bean
*/
-typedef struct sandesha2_property_bean_impl sandesha2_property_bean_impl_t;
-
-struct sandesha2_property_bean_impl
+struct sandesha2_property_bean_t
{
- sandesha2_property_bean_t bean;
long inactive_timeout_interval;
long ack_interval;
long retrans_interval;
axis2_bool_t is_exp_backoff;
axis2_char_t *in_mem_storage_mgr;
- axis2_char_t *permanent_storage_mgr;
+ axis2_char_t *permanant_storage_mgr;
axis2_bool_t is_in_order;
axis2_array_list_t *msg_types_to_drop;
int max_retrans_count;
};
-#define SANDESHA2_INTF_TO_IMPL(bean) \
- ((sandesha2_property_bean_impl_t *)(bean))
-
-/***************************** Function headers *******************************/
-long AXIS2_CALL
-sandesha2_property_bean_get_inactive_timeout_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_inactive_timeout_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, long interval);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_inactive_timeout_interval_with_units
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, long interval,
- axis2_char_t *units);
-
-long AXIS2_CALL
-sandesha2_property_bean_get_ack_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_ack_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, long interval);
-
-long AXIS2_CALL
-sandesha2_property_bean_get_retrans_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_retrans_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, long interval);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_property_bean_is_exp_backoff
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_exp_backoff
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_bool_t exp_backoff);
-
-axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_in_mem_storage_mgr
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_in_mem_storage_mgr
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_char_t *manager);
-
-axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_permanent_storage_mgr
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_permanent_storage_mgr
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_char_t *manager);
-
-axis2_bool_t AXIS2_CALL
-sandesha2_property_bean_is_in_order
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_in_order
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_bool_t in_order);
-
-axis2_array_list_t* AXIS2_CALL
-sandesha2_property_bean_get_msg_types_to_drop
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_msg_types_to_drop
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_array_list_t *msg_types);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_add_msg_type_to_drop
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, int msg_type);
-
-int AXIS2_CALL
-sandesha2_property_bean_get_max_retrans_count
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_max_retrans_count
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, int count);
-
-axis2_status_t AXIS2_CALL
-sandesha2_property_bean_free(sandesha2_property_bean_t *bean,
- const axis2_env_t *env);
-
-/***************************** End of function headers ************************/
-
AXIS2_EXTERN sandesha2_property_bean_t* AXIS2_CALL
-sandesha2_property_bean_create(const axis2_env_t *env)
+sandesha2_property_bean_create(
+ const axis2_env_t *env)
{
- sandesha2_property_bean_impl_t *property_bean_impl = NULL;
+ sandesha2_property_bean_t *bean = NULL;
AXIS2_ENV_CHECK(env, NULL);
- property_bean_impl = (sandesha2_property_bean_impl_t *)AXIS2_MALLOC
- (env->allocator, sizeof(sandesha2_property_bean_impl_t));
+ bean = (sandesha2_property_bean_t *)AXIS2_MALLOC
+ (env->allocator, sizeof(sandesha2_property_bean_t));
- if(NULL == property_bean_impl)
+ if(!bean)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- property_bean_impl->inactive_timeout_interval = 0;
- property_bean_impl->ack_interval = 0;
- property_bean_impl->retrans_interval = 0;
- property_bean_impl->is_exp_backoff = 0;
- property_bean_impl->in_mem_storage_mgr = NULL;
- property_bean_impl->permanent_storage_mgr= NULL;
- property_bean_impl->is_in_order = AXIS2_FALSE;
- property_bean_impl->msg_types_to_drop = NULL;
- property_bean_impl->max_retrans_count = 0;
+ bean->inactive_timeout_interval = 0;
+ bean->ack_interval = 0;
+ bean->retrans_interval = 0;
+ bean->is_exp_backoff = 0;
+ bean->in_mem_storage_mgr = NULL;
+ bean->permanant_storage_mgr= NULL;
+ bean->is_in_order = AXIS2_FALSE;
+ bean->msg_types_to_drop = NULL;
+ bean->max_retrans_count = 0;
- property_bean_impl->bean.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_property_bean_ops_t));
- if(NULL == property_bean_impl->bean.ops)
- {
- sandesha2_property_bean_free((sandesha2_property_bean_t*)
- property_bean_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
-
- property_bean_impl->bean.ops->get_inactive_timeout_interval =
- sandesha2_property_bean_get_inactive_timeout_interval;
- property_bean_impl->bean.ops->set_inactive_timeout_interval =
- sandesha2_property_bean_set_inactive_timeout_interval;
- property_bean_impl->bean.ops->set_inactive_timeout_interval_with_units =
- sandesha2_property_bean_set_inactive_timeout_interval_with_units;
- property_bean_impl->bean.ops->get_ack_interval =
- sandesha2_property_bean_get_ack_interval;
- property_bean_impl->bean.ops->set_ack_interval =
- sandesha2_property_bean_set_ack_interval;
- property_bean_impl->bean.ops->get_retrans_interval =
- sandesha2_property_bean_get_retrans_interval;
- property_bean_impl->bean.ops->set_retrans_interval =
- sandesha2_property_bean_set_retrans_interval;
- property_bean_impl->bean.ops->is_exp_backoff =
- sandesha2_property_bean_is_exp_backoff;
- property_bean_impl->bean.ops->set_exp_backoff =
- sandesha2_property_bean_set_exp_backoff;
- property_bean_impl->bean.ops->get_in_mem_storage_mgr =
- sandesha2_property_bean_get_in_mem_storage_mgr;
- property_bean_impl->bean.ops->set_in_mem_storage_mgr =
- sandesha2_property_bean_set_in_mem_storage_mgr;
- property_bean_impl->bean.ops->get_permanent_storage_mgr =
- sandesha2_property_bean_get_permanent_storage_mgr;
- property_bean_impl->bean.ops->set_permanent_storage_mgr =
- sandesha2_property_bean_set_permanent_storage_mgr;
- property_bean_impl->bean.ops->is_in_order =
- sandesha2_property_bean_is_in_order;
- property_bean_impl->bean.ops->set_in_order =
- sandesha2_property_bean_set_in_order;
- property_bean_impl->bean.ops->get_msg_types_to_drop =
- sandesha2_property_bean_get_msg_types_to_drop;
- property_bean_impl->bean.ops->set_msg_types_to_drop =
- sandesha2_property_bean_set_msg_types_to_drop;
- property_bean_impl->bean.ops->add_msg_type_to_drop =
- sandesha2_property_bean_add_msg_type_to_drop;
- property_bean_impl->bean.ops->get_max_retrans_count =
- sandesha2_property_bean_get_max_retrans_count;
- property_bean_impl->bean.ops->set_max_retrans_count =
- sandesha2_property_bean_set_max_retrans_count;
- property_bean_impl->bean.ops->free = sandesha2_property_bean_free;
-
- return &(property_bean_impl->bean);
+ return bean;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_free(sandesha2_property_bean_t *bean, const axis2_env_t *env)
+sandesha2_property_bean_free(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
- sandesha2_property_bean_impl_t *property_bean_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- property_bean_impl = SANDESHA2_INTF_TO_IMPL(bean);
- if(NULL != property_bean_impl->msg_types_to_drop)
+ if(bean->msg_types_to_drop)
{
- int count = AXIS2_ARRAY_LIST_SIZE(property_bean_impl->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(
- property_bean_impl->msg_types_to_drop, env, i);
+ bean->msg_types_to_drop, env, i);
if(NULL != msg_type)
AXIS2_FREE(env->allocator, msg_type);
}
- AXIS2_ARRAY_LIST_FREE(property_bean_impl->msg_types_to_drop, env);
- }
- if(NULL != property_bean_impl->in_mem_storage_mgr)
- {
- AXIS2_FREE(env->allocator, property_bean_impl->in_mem_storage_mgr);
- property_bean_impl->in_mem_storage_mgr = NULL;
+ AXIS2_ARRAY_LIST_FREE(bean->msg_types_to_drop, env);
}
- if(NULL != property_bean_impl->permanent_storage_mgr)
+ if(bean->in_mem_storage_mgr)
{
- AXIS2_FREE(env->allocator, property_bean_impl->permanent_storage_mgr);
- property_bean_impl->permanent_storage_mgr = NULL;
+ AXIS2_FREE(env->allocator, bean->in_mem_storage_mgr);
+ bean->in_mem_storage_mgr = NULL;
}
- if(NULL != bean->ops)
+ if(bean->permanant_storage_mgr)
{
- AXIS2_FREE(env->allocator, bean->ops);
- bean->ops = NULL;
+ AXIS2_FREE(env->allocator, bean->permanant_storage_mgr);
+ bean->permanant_storage_mgr = NULL;
}
- AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(bean));
+ AXIS2_FREE(env->allocator, bean);
return AXIS2_SUCCESS;
}
long AXIS2_CALL
-sandesha2_property_bean_get_inactive_timeout_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env)
+sandesha2_property_bean_get_inactive_timeout_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, -1);
- return SANDESHA2_INTF_TO_IMPL(bean)->inactive_timeout_interval;
+ return bean->inactive_timeout_interval;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_inactive_timeout_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, long interval)
+sandesha2_property_bean_set_inactive_timeout_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, long interval)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->inactive_timeout_interval = interval;
+ bean->inactive_timeout_interval = interval;
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_inactive_timeout_interval_with_units
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, long interval,
- axis2_char_t *units)
+sandesha2_property_bean_set_inactive_timeout_interval_with_units(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, long interval,
+ axis2_char_t *units)
{
long multiplier = -1;
@@ -316,178 +146,176 @@
}
long AXIS2_CALL
-sandesha2_property_bean_get_ack_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env)
+sandesha2_property_bean_get_ack_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, -1);
- return SANDESHA2_INTF_TO_IMPL(bean)->ack_interval;
+ return bean->ack_interval;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_ack_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, long interval)
+sandesha2_property_bean_set_ack_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, long interval)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->ack_interval = interval;
+ bean->ack_interval = interval;
return AXIS2_SUCCESS;
}
long AXIS2_CALL
-sandesha2_property_bean_get_retrans_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env)
+sandesha2_property_bean_get_retrans_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, -1);
- return SANDESHA2_INTF_TO_IMPL(bean)->retrans_interval;
+ return bean->retrans_interval;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_retrans_interval
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, long interval)
+sandesha2_property_bean_set_retrans_interval(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, long interval)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->retrans_interval = interval;
+ bean->retrans_interval = interval;
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
-sandesha2_property_bean_is_exp_backoff
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env)
+sandesha2_property_bean_is_exp_backoff(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- return SANDESHA2_INTF_TO_IMPL(bean)->is_exp_backoff;
+ return bean->is_exp_backoff;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_exp_backoff
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_bool_t exp_backoff)
+sandesha2_property_bean_set_exp_backoff(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, axis2_bool_t exp_backoff)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->is_exp_backoff = exp_backoff;
+ bean->is_exp_backoff = exp_backoff;
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_in_mem_storage_mgr
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env)
+sandesha2_property_bean_get_in_mem_storage_mgr(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(bean)->in_mem_storage_mgr;
+ return bean->in_mem_storage_mgr;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_in_mem_storage_mgr
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_char_t *manager)
+sandesha2_property_bean_set_in_mem_storage_mgr(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, axis2_char_t *manager)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->in_mem_storage_mgr = AXIS2_STRDUP(manager,
+ bean->in_mem_storage_mgr = AXIS2_STRDUP(manager,
env);
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
-sandesha2_property_bean_get_permanent_storage_mgr
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env)
+sandesha2_property_bean_get_permanant_storage_mgr(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(bean)->permanent_storage_mgr;
+ return bean->permanant_storage_mgr;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_permanent_storage_mgr
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_char_t *manager)
+sandesha2_property_bean_set_permanant_storage_mgr(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, axis2_char_t *manager)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, manager, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->permanent_storage_mgr = AXIS2_STRDUP(
+ bean->permanant_storage_mgr = AXIS2_STRDUP(
manager, env);
return AXIS2_SUCCESS;
}
axis2_bool_t AXIS2_CALL
-sandesha2_property_bean_is_in_order
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env)
+sandesha2_property_bean_is_in_order(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- return SANDESHA2_INTF_TO_IMPL(bean)->is_in_order;
+ return bean->is_in_order;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_in_order
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_bool_t in_order)
+sandesha2_property_bean_set_in_order(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, axis2_bool_t in_order)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->is_in_order = in_order;
+ bean->is_in_order = in_order;
return AXIS2_SUCCESS;
}
axis2_array_list_t* AXIS2_CALL
-sandesha2_property_bean_get_msg_types_to_drop
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env)
+sandesha2_property_bean_get_msg_types_to_drop(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return SANDESHA2_INTF_TO_IMPL(bean)->msg_types_to_drop;
+ return bean->msg_types_to_drop;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_msg_types_to_drop
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, axis2_array_list_t *msg_types)
+sandesha2_property_bean_set_msg_types_to_drop(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, axis2_array_list_t *msg_types)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_types, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->msg_types_to_drop = msg_types;
+ bean->msg_types_to_drop = msg_types;
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_add_msg_type_to_drop
- (sandesha2_property_bean_t *bean,
+sandesha2_property_bean_add_msg_type_to_drop(
+ sandesha2_property_bean_t *bean,
const axis2_env_t *env, int msg_type)
{
int *_msg_type = NULL;
- sandesha2_property_bean_impl_t *property_bean_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- property_bean_impl = SANDESHA2_INTF_TO_IMPL(bean);
- if(NULL == property_bean_impl->msg_types_to_drop)
+ if(NULL == bean->msg_types_to_drop)
return AXIS2_FAILURE;
_msg_type = AXIS2_MALLOC(env->allocator, sizeof(int));
- AXIS2_ARRAY_LIST_ADD(property_bean_impl->msg_types_to_drop, env, _msg_type);
+ AXIS2_ARRAY_LIST_ADD(bean->msg_types_to_drop, env, _msg_type);
return AXIS2_SUCCESS;
}
int AXIS2_CALL
-sandesha2_property_bean_get_max_retrans_count
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env)
+sandesha2_property_bean_get_max_retrans_count (
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, -1);
- return SANDESHA2_INTF_TO_IMPL(bean)->max_retrans_count;
+ return bean->max_retrans_count;
}
axis2_status_t AXIS2_CALL
-sandesha2_property_bean_set_max_retrans_count
- (sandesha2_property_bean_t *bean,
- const axis2_env_t *env, int count)
+sandesha2_property_bean_set_max_retrans_count(
+ sandesha2_property_bean_t *bean,
+ const axis2_env_t *env, int count)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- SANDESHA2_INTF_TO_IMPL(bean)->max_retrans_count = count;
+ bean->max_retrans_count = count;
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/property_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/property_mgr.c Thu Nov 9 01:50:04 2006
@@ -84,24 +84,24 @@
AXIS2_ENV_CHECK(env, NULL);
property_bean = sandesha2_property_bean_create(env);
- SANDESHA2_PROPERTY_BEAN_SET_ACK_INTERVAL(property_bean, env,
+ sandesha2_property_bean_set_ack_interval(property_bean, env,
SANDESHA2_DEF_VAL_ACK_INTERVAL);
- SANDESHA2_PROPERTY_BEAN_SET_EXP_BACKOFF(property_bean, env,
+ sandesha2_property_bean_set_exp_backoff(property_bean, env,
SANDESHA2_DEF_VAL_EXP_BACKOFF);
- SANDESHA2_PROPERTY_BEAN_SET_INACTIVE_TIMEOUT_INTERVAL_WITH_UNITS(
+ sandesha2_property_bean_set_inactive_timeout_interval_with_units(
property_bean, env, SANDESHA2_DEF_VAL_INACTIVETIMEOUT,
SANDESHA2_DEF_VAL_INACTIVETIMEOUT_MEASURE);
- SANDESHA2_PROPERTY_BEAN_SET_IN_ORDER(property_bean, env,
+ sandesha2_property_bean_set_in_order(property_bean, env,
SANDESHA2_DEF_VAL_INORDER_INVOCATION);
- SANDESHA2_PROPERTY_BEAN_SET_MSG_TYPES_TO_DROP(property_bean, env, NULL);
- SANDESHA2_PROPERTY_BEAN_SET_RETRANS_INTERVAL(property_bean, env,
+ sandesha2_property_bean_set_msg_types_to_drop(property_bean, env, NULL);
+ sandesha2_property_bean_set_retrans_interval(property_bean, env,
SANDESHA2_DEF_VAL_RETR_COUNT);
/* will be useful when we are loading libraries */
- SANDESHA2_PROPERTY_BEAN_SET_IN_MEM_STORAGE_MGR(property_bean, env,
+ sandesha2_property_bean_set_in_mem_storage_mgr(property_bean, env,
SANDESHA2_DEF_VAL_IN_MEMORY_STORAGE_MGR);
- SANDESHA2_PROPERTY_BEAN_SET_PERMENENT_STORAGE_MGR(property_bean, env,
+ sandesha2_property_bean_set_permanant_storage_mgr(property_bean, env,
SANDESHA2_DEF_VAL_PERM_STORAGE_MGR);
- SANDESHA2_PROPERTY_BEAN_SET_MAX_RETRANS_COUNT(property_bean, env,
+ sandesha2_property_bean_set_max_retrans_count(property_bean, env,
SANDESHA2_DEF_VAL_MAX_RETR_COUNT);
sandesha2_property_mgr_load_msg_types_to_drop(env,
SANDESHA2_DEF_VAL_MSG_TYPES_TO_DROP, property_bean);
@@ -217,9 +217,9 @@
str = sandesha2_utils_trim_string(env, value);
if(0 == AXIS2_STRCMP(str, SANDESHA2_VALUE_TRUE))
- SANDESHA2_PROPERTY_BEAN_SET_EXP_BACKOFF(property_bean, env, AXIS2_TRUE);
+ sandesha2_property_bean_set_exp_backoff(property_bean, env, AXIS2_TRUE);
else
- SANDESHA2_PROPERTY_BEAN_SET_EXP_BACKOFF(property_bean, env, AXIS2_FALSE);
+ sandesha2_property_bean_set_exp_backoff(property_bean, env, AXIS2_FALSE);
return AXIS2_SUCCESS;
}
@@ -239,7 +239,7 @@
if(NULL != str)
retrans_int = atoi(str);
if(0 < retrans_int)
- SANDESHA2_PROPERTY_BEAN_SET_RETRANS_INTERVAL(property_bean, env,
+ sandesha2_property_bean_set_retrans_interval(property_bean, env,
retrans_int);
return AXIS2_SUCCESS;
}
@@ -260,7 +260,7 @@
if(NULL != str)
ack_int = atoi(str);
if(0 < ack_int)
- SANDESHA2_PROPERTY_BEAN_SET_ACK_INTERVAL(property_bean, env, ack_int);
+ sandesha2_property_bean_set_ack_interval(property_bean, env, ack_int);
return AXIS2_SUCCESS;
}
@@ -287,10 +287,10 @@
if(0 < timeout)
{
if(NULL != str2)
- SANDESHA2_PROPERTY_BEAN_SET_INACTIVE_TIMEOUT_INTERVAL_WITH_UNITS(
+ sandesha2_property_bean_set_inactive_timeout_interval_with_units(
property_bean, env, timeout, str2);
else
- SANDESHA2_PROPERTY_BEAN_SET_INACTIVE_TIMEOUT_INTERVAL(property_bean,
+ sandesha2_property_bean_set_inactive_timeout_interval(property_bean,
env, timeout);
}
return AXIS2_SUCCESS;
@@ -306,7 +306,7 @@
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);
- SANDESHA2_PROPERTY_BEAN_SET_IN_MEM_STORAGE_MGR(property_bean, env, value);
+ sandesha2_property_bean_set_in_mem_storage_mgr(property_bean, env, value);
return AXIS2_SUCCESS;
}
@@ -320,7 +320,7 @@
AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, property_bean, AXIS2_FAILURE);
- SANDESHA2_PROPERTY_BEAN_SET_PERMENENT_STORAGE_MGR(property_bean, env, value);
+ sandesha2_property_bean_set_permanant_storage_mgr(property_bean, env, value);
return AXIS2_SUCCESS;
}
@@ -338,9 +338,9 @@
str = sandesha2_utils_trim_string(env, value);
if(0 == AXIS2_STRCMP(str, SANDESHA2_VALUE_TRUE))
- SANDESHA2_PROPERTY_BEAN_SET_IN_ORDER(property_bean, env, AXIS2_TRUE);
+ sandesha2_property_bean_set_in_order(property_bean, env, AXIS2_TRUE);
else
- SANDESHA2_PROPERTY_BEAN_SET_IN_ORDER(property_bean, env, AXIS2_FALSE);
+ sandesha2_property_bean_set_in_order(property_bean, env, AXIS2_FALSE);
return AXIS2_SUCCESS;
}
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/sandesha2_utils.c (original)
+++ webservices/sandesha/trunk/c/src/util/sandesha2_utils.c Thu Nov 9 01:50:04 2006
@@ -883,7 +883,7 @@
sandesha2_seq_t *seq = NULL;
seq = (sandesha2_seq_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_SEQ);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_get_identifier(seq, env), env);
}
else if(SANDESHA2_MSG_TYPE_ACK == msg_type)
@@ -891,7 +891,7 @@
sandesha2_seq_ack_t *seq_ack = NULL;
seq_ack = (sandesha2_seq_ack_t*)SANDESHA2_MSG_CTX_GET_MSG_PART(
rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ_ACKNOWLEDGEMENT);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_seq_ack_get_identifier(seq_ack, env), env);
}
else if(SANDESHA2_MSG_TYPE_ACK_REQUEST == msg_type)
@@ -900,7 +900,7 @@
ack_requested = (sandesha2_ack_requested_t*)
SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_ACK_REQUEST);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
SANDESHA2_ACK_REQUESTED_GET_IDENTIFIER(ack_requested,
env), env);
}
@@ -910,7 +910,7 @@
close_seq = (sandesha2_close_seq_t*)
SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_CLOSE_SEQ);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_close_seq_get_identifier(close_seq,
env), env);
}
@@ -920,7 +920,7 @@
close_seq_res = (sandesha2_close_seq_res_t*)
SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_CLOSE_SEQ_RESPONSE);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_close_res_seq_get_identifier(close_seq_res,
env), env);
}
Modified: webservices/sandesha/trunk/c/src/util/seq_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/seq_mgr.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/seq_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/seq_mgr.c Thu Nov 9 01:50:04 2006
@@ -100,7 +100,7 @@
AXIS2_FAILURE);
return NULL;
}
- temp_acks_to = SANDESHA2_CREATE_SEQ_GET_ACKS_TO(create_seq, env);
+ temp_acks_to = sandesha2_create_seq_get_acks_to(create_seq, env);
temp_address = SANDESHA2_ACKS_TO_GET_ADDRESS(temp_acks_to, env);
acks_to = SANDESHA2_ADDRESS_GET_EPR(temp_address, env);
if(!acks_to)
@@ -255,14 +255,14 @@
property_bean = sandesha2_utils_get_property_bean_from_op(env,
AXIS2_MSG_CTX_GET_OP(SANDESHA2_MSG_CTX_GET_MSG_CTX(
rm_msg_ctx, env), env));
- if(SANDESHA2_PROPERTY_BEAN_GET_INACTIVE_TIMEOUT_INTERVAL(property_bean, env)
+ if(sandesha2_property_bean_get_inactive_timeout_interval(property_bean, env)
<= 0)
return AXIS2_FALSE;
last_activated_time = sandesha2_seq_mgr_get_last_activated_time(env,
property_key, storage_mgr);
current_time = sandesha2_utils_get_current_time_in_millis(env);
if(last_activated_time > 0 && (last_activated_time +
- SANDESHA2_PROPERTY_BEAN_GET_INACTIVE_TIMEOUT_INTERVAL(
+ sandesha2_property_bean_get_inactive_timeout_interval(
property_bean, env) < current_time))
seq_timedout = AXIS2_TRUE;
return seq_timedout;
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/util/terminate_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/util/terminate_mgr.c Thu Nov 9 01:50:04 2006
@@ -55,7 +55,7 @@
prop_bean = sandesha2_utils_get_property_bean(env, AXIS2_CONF_CTX_GET_CONF(
conf_ctx, env));
- in_order_invoke = SANDESHA2_PROPERTY_BEAN_IS_IN_ORDER(prop_bean, env);
+ in_order_invoke = sandesha2_property_bean_is_in_order(prop_bean, env);
if(AXIS2_FALSE == in_order_invoke)
sandesha2_terminate_mgr_clean_recv_side_after_invocation(env, conf_ctx,
seq_id, storage_man);
@@ -98,21 +98,21 @@
invoker_mgr = sandesha2_storage_mgr_get_storage_map_mgr(storage_man, env);
find_bean = sandesha2_invoker_bean_create(env);
- SANDESHA2_INVOKER_BEAN_SET_SEQ_ID(find_bean, env, seq_id);
- SANDESHA2_INVOKER_BEAN_SET_INVOKED(find_bean, env, AXIS2_TRUE);
+ sandesha2_invoker_bean_set_seq_id(find_bean, env, seq_id);
+ sandesha2_invoker_bean_set_invoked(find_bean, env, AXIS2_TRUE);
- found_list = SANDESHA2_INVOKER_MGR_FIND(invoker_mgr, env, find_bean);
+ found_list = sandesha2_invoker_mgr_find(invoker_mgr, env, find_bean);
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);
- msg_store_key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(map_bean,
+ msg_store_key = sandesha2_invoker_bean_get_msg_ctx_ref_key(map_bean,
env);
sandesha2_storage_mgr_remove_msg_ctx(storage_man, env, msg_store_key);
- SANDESHA2_INVOKER_MGR_REMOVE(invoker_mgr, env,
- SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(map_bean,
+ sandesha2_invoker_mgr_remove(invoker_mgr, env,
+ sandesha2_invoker_bean_get_msg_ctx_ref_key(map_bean,
env));
}
clean_status = axis2_hash_get(sandesha2_terminate_mgr_rcv_side_clean_map,
@@ -403,7 +403,7 @@
}
find_create_seq_bean = sandesha2_create_seq_bean_create(env);
- SANDESHA2_CREATE_SEQ_BEAN_SET_INTERNAL_SEQ_ID(find_create_seq_bean, env,
+ sandesha2_create_seq_bean_set_internal_seq_id(find_create_seq_bean, env,
seq_id);
found_list = SANDESHA2_CREATE_SEQ_MGR_FIND(create_seq_mgr, env,
find_create_seq_bean);
@@ -416,7 +416,7 @@
create_seq_bean = AXIS2_ARRAY_LIST_GET(found_list, env, i);
SANDESHA2_CREATE_SEQ_MGR_REMOVE(create_seq_mgr, env,
- SANDESHA2_CREATE_SEQ_BEAN_GET_CREATE_SEQ_MSG_ID(
+ sandesha2_create_seq_bean_get_create_seq_msg_id(
create_seq_bean, 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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original)
+++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Thu Nov 9 01:50:04 2006
@@ -416,7 +416,7 @@
}
find_bean = sandesha2_invoker_bean_create_with_data(env, NULL,
next_msg_no, seq_id, AXIS2_FALSE);
- st_map_list = SANDESHA2_INVOKER_MGR_FIND(storage_map_mgr,
+ st_map_list = sandesha2_invoker_mgr_find(storage_map_mgr,
env, find_bean);
for(j = 0; j < AXIS2_ARRAY_LIST_SIZE(st_map_list, env); j++)
{
@@ -431,7 +431,7 @@
axis2_engine_t *engine = NULL;
st_map_bean = AXIS2_ARRAY_LIST_GET(st_map_list, env, j);
- key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(st_map_bean,
+ 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);
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=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/sender.c (original)
+++ webservices/sandesha/trunk/c/src/workers/sender.c Thu Nov 9 01:50:04 2006
@@ -537,7 +537,7 @@
prop_bean = sandesha2_utils_get_property_bean_from_op(env,
AXIS2_MSG_CTX_GET_OP(msg_ctx, env));
if(prop_bean)
- msgs_not_to_send = SANDESHA2_PROPERTY_BEAN_GET_MSG_TYPES_TO_DROP(
+ msgs_not_to_send = sandesha2_property_bean_get_msg_types_to_drop(
prop_bean, env);
if(msgs_not_to_send)
{
@@ -574,7 +574,7 @@
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);
+ seq_id = sandesha2_identifier_get_identifier(identifier, env);
}
if(sandesha2_sender_is_piggybackable_msg_type(sender, env,
@@ -660,7 +660,7 @@
terminate_seq = (sandesha2_terminate_seq_t*)
SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env,
SANDESHA2_MSG_PART_TERMINATE_SEQ);
- seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(
+ seq_id = sandesha2_identifier_get_identifier(
sandesha2_terminate_seq_get_identifier(terminate_seq,
env), env);
conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
Modified: webservices/sandesha/trunk/c/src/wsrm/ack_range.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_range.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_range.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_range.c Thu Nov 9 01:50:04 2006
@@ -90,7 +90,6 @@
ack_range_impl->upper_val = 0;
ack_range_impl->lower_val = 0;
ack_range_impl->ack_range.element.ops = NULL;
- ack_range_impl->ack_range.ops = NULL;
ack_range_impl->ack_range.element.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_element_ops_t));
Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq.c Thu Nov 9 01:50:04 2006
@@ -38,55 +38,40 @@
((sandesha2_create_seq_impl_t *)(create_seq))
/***************************** Function headers *******************************/
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_create_seq_get_namespace_value (
- sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env);
+ sandesha2_iom_rm_element_t *create_seq,
+ const axis2_env_t *env);
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_create_seq_from_om_node(sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env, axiom_node_t *om_node);
+ const axis2_env_t *env, axiom_node_t *om_node);
-axiom_node_t* AXIS2_CALL
+static axiom_node_t* AXIS2_CALL
sandesha2_create_seq_to_om_node(sandesha2_iom_rm_element_t *element,
- const axis2_env_t *env, void *om_node);
+ const axis2_env_t *env, void *om_node);
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_create_seq_is_namespace_supported(
- sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env, axis2_char_t *namespace);
-
-sandesha2_acks_to_t * AXIS2_CALL
-sandesha2_create_seq_get_acks_to(sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_set_acks_to(sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env, sandesha2_acks_to_t *acks_to);
-
-sandesha2_seq_offer_t * AXIS2_CALL
-sandesha2_create_seq_get_seq_offer(sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_set_seq_offer(sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env,
- sandesha2_seq_offer_t *seq_offer);
-
-axis2_status_t AXIS2_CALL
+ sandesha2_iom_rm_element_t *create_seq,
+ const axis2_env_t *env, axis2_char_t *namespace);
+
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_to_soap_env(sandesha2_iom_rm_part_t *create_seq,
- const axis2_env_t *env,
- axiom_soap_envelope_t *envelope);
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *envelope);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_free (sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
AXIS2_EXTERN sandesha2_create_seq_t* AXIS2_CALL
-sandesha2_create_seq_create(const axis2_env_t *env, axis2_char_t *addr_ns_val,
- axis2_char_t *rm_ns_val)
+sandesha2_create_seq_create(
+ const axis2_env_t *env,
+ axis2_char_t *addr_ns_val,
+ axis2_char_t *rm_ns_val)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -114,19 +99,9 @@
create_seq_impl->acks_to = NULL;
create_seq_impl->expires = NULL;
create_seq_impl->seq_offer = NULL;
- create_seq_impl->create_seq.ops = NULL;
create_seq_impl->create_seq.part.ops = NULL;
create_seq_impl->create_seq.part.element.ops = NULL;
- create_seq_impl->create_seq.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_create_seq_ops_t));
- if(NULL == create_seq_impl->create_seq.ops)
- {
- sandesha2_create_seq_free((sandesha2_iom_rm_element_t*)
- create_seq_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
create_seq_impl->create_seq.part.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_part_ops_t));
if(NULL == create_seq_impl->create_seq.part.ops)
@@ -159,14 +134,6 @@
sandesha2_create_seq_is_namespace_supported;
create_seq_impl->create_seq.part.ops->to_soap_env =
sandesha2_create_seq_to_soap_env;
- create_seq_impl->create_seq.ops->set_acks_to =
- sandesha2_create_seq_set_acks_to;
- create_seq_impl->create_seq.ops->get_acks_to =
- sandesha2_create_seq_get_acks_to;
- create_seq_impl->create_seq.ops->set_seq_offer =
- sandesha2_create_seq_set_seq_offer;
- create_seq_impl->create_seq.ops->get_seq_offer =
- sandesha2_create_seq_get_seq_offer;
create_seq_impl->create_seq.part.element.ops->free =
sandesha2_create_seq_free;
@@ -174,20 +141,21 @@
}
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_free (sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env)
+static axis2_status_t AXIS2_CALL
+sandesha2_create_seq_free (
+ sandesha2_iom_rm_element_t *create_seq,
+ const axis2_env_t *env)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
create_seq_impl = SANDESHA2_INTF_TO_IMPL(create_seq);
- if(NULL != create_seq_impl->rm_ns_val)
+ if(create_seq_impl->rm_ns_val)
{
AXIS2_FREE(env->allocator, create_seq_impl->rm_ns_val);
create_seq_impl->rm_ns_val = NULL;
}
- if(NULL != create_seq_impl->addr_ns_val)
+ if(create_seq_impl->addr_ns_val)
{
AXIS2_FREE(env->allocator, create_seq_impl->addr_ns_val);
create_seq_impl->addr_ns_val = NULL;
@@ -195,17 +163,17 @@
create_seq_impl->acks_to = NULL;
create_seq_impl->expires = NULL;
create_seq_impl->seq_offer = NULL;
- if(NULL != create_seq->ops)
+ if(create_seq->ops)
{
AXIS2_FREE(env->allocator, create_seq->ops);
create_seq->ops = NULL;
}
- if(NULL != create_seq_impl->create_seq.part.ops)
+ if(create_seq_impl->create_seq.part.ops)
{
AXIS2_FREE(env->allocator, create_seq_impl->create_seq.part.ops);
create_seq_impl->create_seq.part.ops = NULL;
}
- if(NULL != create_seq_impl->create_seq.part.element.ops)
+ if(create_seq_impl->create_seq.part.element.ops)
{
AXIS2_FREE(env->allocator, create_seq_impl->create_seq.part.element.ops);
create_seq_impl->create_seq.part.element.ops = NULL;
@@ -214,10 +182,10 @@
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_create_seq_get_namespace_value (
- sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env)
+ sandesha2_iom_rm_element_t *create_seq,
+ const axis2_env_t *env)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -227,9 +195,10 @@
}
-void* AXIS2_CALL
-sandesha2_create_seq_from_om_node(sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env, axiom_node_t *om_node)
+static void* AXIS2_CALL
+sandesha2_create_seq_from_om_node(
+ sandesha2_iom_rm_element_t *create_seq,
+ const axis2_env_t *env, axiom_node_t *om_node)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
axiom_element_t *om_element = NULL;
@@ -329,9 +298,11 @@
return create_seq;
}
-axiom_node_t* AXIS2_CALL
-sandesha2_create_seq_to_om_node(sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env, void *om_node)
+static axiom_node_t* AXIS2_CALL
+sandesha2_create_seq_to_om_node(
+ sandesha2_iom_rm_element_t *create_seq,
+ const axis2_env_t *env,
+ void *om_node)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
axiom_namespace_t *rm_ns = NULL;
@@ -376,10 +347,11 @@
return (axiom_node_t*)om_node;
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_create_seq_is_namespace_supported(
- sandesha2_iom_rm_element_t *create_seq,
- const axis2_env_t *env, axis2_char_t *namespace)
+ sandesha2_iom_rm_element_t *create_seq,
+ const axis2_env_t *env,
+ axis2_char_t *namespace)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -397,8 +369,9 @@
}
sandesha2_acks_to_t * AXIS2_CALL
-sandesha2_create_seq_get_acks_to(sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env)
+sandesha2_create_seq_get_acks_to(
+ sandesha2_create_seq_t *create_seq,
+ const axis2_env_t *env)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -409,8 +382,9 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_create_seq_set_acks_to(sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env, sandesha2_acks_to_t *acks_to)
+sandesha2_create_seq_set_acks_to(
+ sandesha2_create_seq_t *create_seq,
+ const axis2_env_t *env, sandesha2_acks_to_t *acks_to)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -427,8 +401,9 @@
}
sandesha2_seq_offer_t * AXIS2_CALL
-sandesha2_create_seq_get_seq_offer(sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env)
+sandesha2_create_seq_get_seq_offer(
+ sandesha2_create_seq_t *create_seq,
+ const axis2_env_t *env)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -439,9 +414,10 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_create_seq_set_seq_offer(sandesha2_create_seq_t *create_seq,
- const axis2_env_t *env,
- sandesha2_seq_offer_t *seq_offer)
+sandesha2_create_seq_set_seq_offer(
+ sandesha2_create_seq_t *create_seq,
+ const axis2_env_t *env,
+ sandesha2_seq_offer_t *seq_offer)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -457,9 +433,10 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_to_soap_env(sandesha2_iom_rm_part_t *create_seq,
- const axis2_env_t *env, axiom_soap_envelope_t *envelope)
+static axis2_status_t AXIS2_CALL
+sandesha2_create_seq_to_soap_env(
+ sandesha2_iom_rm_part_t *create_seq,
+ const axis2_env_t *env, axiom_soap_envelope_t *envelope)
{
sandesha2_create_seq_impl_t *create_seq_impl = NULL;
axiom_node_t *body_node = NULL;
@@ -486,3 +463,4 @@
env, body_node);
return AXIS2_SUCCESS;
}
+
Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c Thu Nov 9 01:50:04 2006
@@ -37,61 +37,38 @@
((sandesha2_create_seq_res_impl_t *)(create_seq_res))
/***************************** Function headers *******************************/
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_create_seq_res_get_namespace_value (
- sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env);
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env);
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_create_seq_res_from_om_node(
- sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env, axiom_node_t *om_node);
-
-axiom_node_t* AXIS2_CALL
-sandesha2_create_seq_res_to_om_node(sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env, void *om_node);
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env,
+ axiom_node_t *om_node);
+
+static axiom_node_t* AXIS2_CALL
+ sandesha2_create_seq_res_to_om_node(
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env,
+ void *om_node);
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_create_seq_res_is_namespace_supported(
- sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env,
- axis2_char_t *namespace);
-
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_res_set_identifier(
- sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier);
-
-sandesha2_identifier_t * AXIS2_CALL
-sandesha2_create_seq_res_get_identifier(
- sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_res_set_accept(sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env, sandesha2_accept_t *accept);
-
-sandesha2_accept_t * AXIS2_CALL
-sandesha2_create_seq_res_get_accept(sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_res_set_expires(sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env, sandesha2_expires_t *expires);
-
-sandesha2_expires_t * AXIS2_CALL
-sandesha2_create_seq_res_get_expires(sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env);
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env,
+ axis2_char_t *namespace);
-axis2_status_t AXIS2_CALL
+static axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_to_soap_env(sandesha2_iom_rm_part_t *create_seq_res,
- const axis2_env_t *env,
- axiom_soap_envelope_t *envelope);
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *envelope);
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_res_free (sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env);
+static axis2_status_t AXIS2_CALL
+sandesha2_create_seq_res_free (
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
@@ -126,19 +103,9 @@
create_seq_res_impl->identifier = NULL;
create_seq_res_impl->accept = NULL;
create_seq_res_impl->expires = NULL;
- create_seq_res_impl->create_seq_res.ops = NULL;
create_seq_res_impl->create_seq_res.part.ops = NULL;
create_seq_res_impl->create_seq_res.part.element.ops = NULL;
- create_seq_res_impl->create_seq_res.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_create_seq_res_ops_t));
- if(NULL == create_seq_res_impl->create_seq_res.ops)
- {
- sandesha2_create_seq_res_free((sandesha2_iom_rm_element_t*)
- create_seq_res_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
create_seq_res_impl->create_seq_res.part.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_part_ops_t));
if(NULL == create_seq_res_impl->create_seq_res.part.ops)
@@ -172,18 +139,6 @@
= sandesha2_create_seq_res_is_namespace_supported;
create_seq_res_impl->create_seq_res.part.ops->to_soap_env =
sandesha2_create_seq_res_to_soap_env;
- create_seq_res_impl->create_seq_res.ops->set_identifier =
- sandesha2_create_seq_res_set_identifier;
- create_seq_res_impl->create_seq_res.ops->get_identifier =
- sandesha2_create_seq_res_get_identifier;
- create_seq_res_impl->create_seq_res.ops->set_accept =
- sandesha2_create_seq_res_set_accept;
- create_seq_res_impl->create_seq_res.ops->get_accept =
- sandesha2_create_seq_res_get_accept;
- create_seq_res_impl->create_seq_res.ops->set_expires =
- sandesha2_create_seq_res_set_expires;
- create_seq_res_impl->create_seq_res.ops->get_expires =
- sandesha2_create_seq_res_get_expires;
create_seq_res_impl->create_seq_res.part.element.ops->free =
sandesha2_create_seq_res_free;
@@ -191,35 +146,26 @@
}
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_res_free (sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env)
+static axis2_status_t AXIS2_CALL
+sandesha2_create_seq_res_free (
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
create_seq_res_impl = SANDESHA2_INTF_TO_IMPL(create_seq_res);
- if(NULL != create_seq_res_impl->addr_ns_val)
+ if(create_seq_res_impl->addr_ns_val)
{
AXIS2_FREE(env->allocator, create_seq_res_impl->addr_ns_val);
create_seq_res_impl->addr_ns_val = NULL;
}
- if(NULL != create_seq_res_impl->rm_ns_val)
+ if(create_seq_res_impl->rm_ns_val)
{
AXIS2_FREE(env->allocator, create_seq_res_impl->rm_ns_val);
create_seq_res_impl->rm_ns_val = NULL;
}
- if(NULL != create_seq_res->ops)
- {
- AXIS2_FREE(env->allocator, create_seq_res->ops);
- create_seq_res->ops = NULL;
- }
- if(NULL != create_seq_res_impl->create_seq_res.ops)
- {
- AXIS2_FREE(env->allocator, create_seq_res_impl->create_seq_res.ops);
- create_seq_res_impl->create_seq_res.ops = NULL;
- }
- if(NULL != create_seq_res_impl->create_seq_res.part.ops)
+ if(create_seq_res_impl->create_seq_res.part.ops)
{
AXIS2_FREE(env->allocator, create_seq_res_impl->create_seq_res.part.ops);
create_seq_res_impl->create_seq_res.part.ops = NULL;
@@ -228,10 +174,10 @@
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_create_seq_res_get_namespace_value (
- sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env)
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -241,10 +187,10 @@
}
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_create_seq_res_from_om_node(
- sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env, axiom_node_t *om_node)
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env, axiom_node_t *om_node)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
axiom_element_t *om_element = NULL;
@@ -344,9 +290,11 @@
}
-axiom_node_t* AXIS2_CALL
-sandesha2_create_seq_res_to_om_node(sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env, void *om_node)
+static axiom_node_t* AXIS2_CALL
+sandesha2_create_seq_res_to_om_node(
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env,
+ void *om_node)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
axiom_namespace_t *rm_ns = NULL;
@@ -392,11 +340,11 @@
return (axiom_node_t*)om_node;
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_create_seq_res_is_namespace_supported(
- sandesha2_iom_rm_element_t *create_seq_res,
- const axis2_env_t *env,
- axis2_char_t *namespace)
+ sandesha2_iom_rm_element_t *create_seq_res,
+ const axis2_env_t *env,
+ axis2_char_t *namespace)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -415,9 +363,9 @@
axis2_status_t AXIS2_CALL
sandesha2_create_seq_res_set_identifier(
- sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env,
- sandesha2_identifier_t *identifier)
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env,
+ sandesha2_identifier_t *identifier)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -430,8 +378,8 @@
sandesha2_identifier_t * AXIS2_CALL
sandesha2_create_seq_res_get_identifier(
- sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env)
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -441,8 +389,9 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_create_seq_res_set_accept(sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env, sandesha2_accept_t *accept)
+sandesha2_create_seq_res_set_accept(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env, sandesha2_accept_t *accept)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -454,8 +403,9 @@
sandesha2_accept_t * AXIS2_CALL
-sandesha2_create_seq_res_get_accept(sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env)
+sandesha2_create_seq_res_get_accept(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -465,8 +415,9 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_create_seq_res_set_expires(sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env, sandesha2_expires_t *expires)
+sandesha2_create_seq_res_set_expires(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env, sandesha2_expires_t *expires)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -478,8 +429,9 @@
sandesha2_expires_t * AXIS2_CALL
-sandesha2_create_seq_res_get_expires(sandesha2_create_seq_res_t *create_seq_res,
- const axis2_env_t *env)
+sandesha2_create_seq_res_get_expires(
+ sandesha2_create_seq_res_t *create_seq_res,
+ const axis2_env_t *env)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -488,9 +440,10 @@
return create_seq_res_impl->expires;
}
-axis2_status_t AXIS2_CALL
-sandesha2_create_seq_res_to_soap_env(sandesha2_iom_rm_part_t *create_seq_res,
- const axis2_env_t *env, axiom_soap_envelope_t *envelope)
+static axis2_status_t AXIS2_CALL
+sandesha2_create_seq_res_to_soap_env(
+ sandesha2_iom_rm_part_t *create_seq_res,
+ const axis2_env_t *env, axiom_soap_envelope_t *envelope)
{
sandesha2_create_seq_res_impl_t *create_seq_res_impl = NULL;
axiom_node_t *body_node = NULL;
@@ -517,3 +470,4 @@
create_seq_res, env, body_node);
return AXIS2_SUCCESS;
}
+
Modified: webservices/sandesha/trunk/c/src/wsrm/identifier.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/identifier.c?view=diff&rev=472834&r1=472833&r2=472834
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/identifier.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/identifier.c Thu Nov 9 01:50:04 2006
@@ -33,37 +33,30 @@
((sandesha2_identifier_impl_t *)(identifier))
/***************************** Function headers *******************************/
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_identifier_get_namespace_value (
- sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env);
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env);
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_identifier_from_om_node(
- sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env, axiom_node_t *om_node);
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env, axiom_node_t *om_node);
-axiom_node_t* AXIS2_CALL
+static axiom_node_t* AXIS2_CALL
sandesha2_identifier_to_om_node(
- sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env, void *om_node);
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env, void *om_node);
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_identifier_is_namespace_supported(
- sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env, axis2_char_t *namespace);
-
-axis2_char_t * AXIS2_CALL
-sandesha2_identifier_get_identifier(sandesha2_identifier_t *identifier,
- const axis2_env_t *env);
-
-axis2_status_t AXIS2_CALL
-sandesha2_identifier_set_identifier(sandesha2_identifier_t *identifier,
- const axis2_env_t *env, axis2_char_t *str_id);
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env, axis2_char_t *namespace);
-axis2_status_t AXIS2_CALL
-sandesha2_identifier_free (sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env);
+static axis2_status_t AXIS2_CALL
+sandesha2_identifier_free (
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env);
/***************************** End of function headers ************************/
@@ -86,7 +79,6 @@
}
identifier_impl->ns_val = NULL;
identifier_impl->str_id = NULL;
- identifier_impl->identifier.ops = NULL;
identifier_impl->identifier.element.ops = NULL;
if(AXIS2_FALSE == sandesha2_identifier_is_namespace_supported(
@@ -98,15 +90,6 @@
return NULL;
}
- identifier_impl->identifier.ops = AXIS2_MALLOC(env->allocator,
- sizeof(sandesha2_identifier_ops_t));
- if(NULL == identifier_impl->identifier.ops)
- {
- sandesha2_identifier_free((sandesha2_iom_rm_element_t*)
- identifier_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
identifier_impl->identifier.element.ops = AXIS2_MALLOC(env->allocator,
sizeof(sandesha2_iom_rm_element_ops_t));
@@ -127,52 +110,44 @@
sandesha2_identifier_to_om_node;
identifier_impl->identifier.element.ops->is_namespace_supported =
sandesha2_identifier_is_namespace_supported;
- identifier_impl->identifier.ops->get_identifier =
- sandesha2_identifier_get_identifier;
- identifier_impl->identifier.ops->set_identifier =
- sandesha2_identifier_set_identifier;
identifier_impl->identifier.element.ops->free = sandesha2_identifier_free;
return &(identifier_impl->identifier);
}
-axis2_status_t AXIS2_CALL
-sandesha2_identifier_free (sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env)
+static axis2_status_t AXIS2_CALL
+sandesha2_identifier_free (
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env)
{
sandesha2_identifier_impl_t *identifier_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
identifier_impl = SANDESHA2_INTF_TO_IMPL(identifier);
- if(NULL != identifier_impl->ns_val)
+ if(identifier_impl->ns_val)
{
AXIS2_FREE(env->allocator, identifier_impl->ns_val);
identifier_impl->ns_val = NULL;
}
- if(NULL != identifier_impl->str_id)
+ if(identifier_impl->str_id)
{
AXIS2_FREE(env->allocator, identifier_impl->str_id);
identifier_impl->str_id = NULL;
}
- if(NULL != identifier_impl->identifier.element.ops)
+ if(identifier_impl->identifier.element.ops)
{
AXIS2_FREE(env->allocator, identifier_impl->identifier.element.ops);
identifier_impl->identifier.element.ops = NULL;
}
- if(NULL != identifier->ops)
- {
- AXIS2_FREE(env->allocator, identifier->ops);
- identifier->ops = NULL;
- }
AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(identifier));
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL
+static axis2_char_t* AXIS2_CALL
sandesha2_identifier_get_namespace_value (
- sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env)
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env)
{
sandesha2_identifier_impl_t *identifier_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -182,11 +157,11 @@
}
-void* AXIS2_CALL
+static void* AXIS2_CALL
sandesha2_identifier_from_om_node(
- sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env,
- axiom_node_t *om_node)
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env,
+ axiom_node_t *om_node)
{
sandesha2_identifier_impl_t *identifier_impl = NULL;
axiom_element_t *om_element = NULL;
@@ -236,9 +211,10 @@
}
-axiom_node_t* AXIS2_CALL
-sandesha2_identifier_to_om_node(sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env, void *om_node)
+static axiom_node_t* AXIS2_CALL
+sandesha2_identifier_to_om_node(
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env, void *om_node)
{
sandesha2_identifier_impl_t *identifier_impl = NULL;
axiom_namespace_t *rm_ns = NULL;
@@ -249,7 +225,7 @@
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
identifier_impl = SANDESHA2_INTF_TO_IMPL(identifier);
- if(NULL == identifier_impl->str_id || 0 == AXIS2_STRLEN(
+ if(!identifier_impl->str_id || 0 == AXIS2_STRLEN(
identifier_impl->str_id))
{
AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_TO_OM_NULL_ELEMENT,
@@ -258,13 +234,13 @@
}
rm_ns = axiom_namespace_create(env, identifier_impl->ns_val,
SANDESHA2_WSRM_COMMON_NS_PREFIX_RM);
- if(NULL == rm_ns)
+ if(!rm_ns)
{
return NULL;
}
id_element = axiom_element_create(env, NULL,
SANDESHA2_WSRM_COMMON_IDENTIFIER, rm_ns, &id_node);
- if(NULL == id_element)
+ if(!id_element)
{
return NULL;
}
@@ -274,10 +250,11 @@
return (axiom_node_t*)om_node;
}
-axis2_bool_t AXIS2_CALL
+static axis2_bool_t AXIS2_CALL
sandesha2_identifier_is_namespace_supported(
- sandesha2_iom_rm_element_t *identifier,
- const axis2_env_t *env, axis2_char_t *namespace)
+ sandesha2_iom_rm_element_t *identifier,
+ const axis2_env_t *env,
+ axis2_char_t *namespace)
{
sandesha2_identifier_impl_t *identifier_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -295,8 +272,9 @@
}
axis2_char_t * AXIS2_CALL
-sandesha2_identifier_get_identifier(sandesha2_identifier_t *identifier,
- const axis2_env_t *env)
+sandesha2_identifier_get_identifier(
+ sandesha2_identifier_t *identifier,
+ const axis2_env_t *env)
{
sandesha2_identifier_impl_t *identifier_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -307,8 +285,9 @@
}
axis2_status_t AXIS2_CALL
-sandesha2_identifier_set_identifier(sandesha2_identifier_t *identifier,
- const axis2_env_t *env, axis2_char_t *str_id)
+sandesha2_identifier_set_identifier(
+ sandesha2_identifier_t *identifier,
+ const axis2_env_t *env, axis2_char_t *str_id)
{
sandesha2_identifier_impl_t *identifier_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -323,3 +302,4 @@
identifier_impl->str_id = (axis2_char_t *)AXIS2_STRDUP(str_id, env);
return AXIS2_SUCCESS;
}
+
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org