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=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/workers/in_order_invoker.c (original) +++ webservices/sandesha/trunk/c/src/workers/in_order_invoker.c Wed Nov 8 19:48:04 2006 @@ -353,13 +353,13 @@ storage_mgr = sandesha2_utils_get_storage_mgr(env, invoker_impl->conf_ctx, AXIS2_CONF_CTX_GET_CONF(invoker_impl->conf_ctx, env)); - next_msg_mgr = SANDESHA2_STORAGE_MGR_GET_NEXT_MSG_MGR( + next_msg_mgr = sandesha2_storage_mgr_get_next_msg_mgr( storage_mgr, env); - storage_map_mgr = SANDESHA2_STORAGE_MGR_GET_STORAGE_MAP_MGR + storage_map_mgr = sandesha2_storage_mgr_get_storage_map_mgr (storage_mgr, env); - seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR( + seq_prop_mgr = sandesha2_storage_mgr_get_seq_property_mgr( storage_mgr, env); - transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr, + transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env); all_seq_bean = SANDESHA2_SEQ_PROPERTY_MGR_RETRIEVE(seq_prop_mgr, env, SANDESHA2_SEQ_PROP_ALL_SEQS, @@ -384,7 +384,7 @@ seq_id = AXIS2_ARRAY_LIST_GET(all_seq_list, env, i); SANDESHA2_TRANSACTION_COMMIT(transaction, env); - transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION( + transaction = sandesha2_storage_mgr_get_transaction( storage_mgr, env); next_msg_bean = SANDESHA2_NEXT_MSG_MGR_RETRIEVE( next_msg_mgr, env, seq_id); @@ -433,7 +433,7 @@ st_map_bean = AXIS2_ARRAY_LIST_GET(st_map_list, env, j); key = SANDESHA2_INVOKER_BEAN_GET_MSG_CONTEXT_REF_KEY(st_map_bean, env); - msg_to_invoke = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX( + msg_to_invoke = sandesha2_storage_mgr_retrieve_msg_ctx( storage_mgr, env, key, invoker_impl->conf_ctx); if(msg_to_invoke) rm_msg_ctx = sandesha2_msg_init_init_msg(env, @@ -470,13 +470,13 @@ AXIS2_ENGINE_RESUME_RECEIVE(engine, env, msg_to_invoke); } invoked = AXIS2_TRUE; - transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION( + transaction = sandesha2_storage_mgr_get_transaction( storage_mgr, env); - SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, env, key); - msg_ctx = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX( + 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); if(msg_ctx) - SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, + 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)) @@ -484,7 +484,7 @@ sandesha2_seq_t *seq = NULL; 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)) + if(sandesha2_seq_get_last_msg(seq, env)) { sandesha2_terminate_mgr_clean_recv_side_after_invocation( env, invoker_impl->conf_ctx, seq_id,
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=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/workers/sender.c (original) +++ webservices/sandesha/trunk/c/src/workers/sender.c Wed Nov 8 19:48:04 2006 @@ -491,10 +491,10 @@ axis2_char_t *msg_id = NULL; AXIS2_SLEEP(1); - transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr, + transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env); - mgr = SANDESHA2_STORAGE_MGR_GET_RETRANS_MGR(storage_mgr, env); - seq_prop_mgr = SANDESHA2_STORAGE_MGR_GET_SEQ_PROPERTY_MGR( + 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); if(!sender_bean) @@ -503,7 +503,7 @@ } key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY(sender_bean, env); - msg_ctx = SANDESHA2_STORAGE_MGR_RETRIEVE_MSG_CTX(storage_mgr, env, key, + msg_ctx = sandesha2_storage_mgr_retrieve_msg_ctx(storage_mgr, env, key, sender_impl->conf_ctx); if(!msg_ctx) { @@ -573,7 +573,7 @@ seq = (sandesha2_seq_t*) SANDESHA2_MSG_CTX_GET_MSG_PART(rm_msg_ctx, env, SANDESHA2_MSG_PART_SEQ); - identifier = SANDESHA2_SEQ_GET_IDENTIFIER(seq, env); + identifier = sandesha2_seq_get_identifier(seq, env); seq_id = SANDESHA2_IDENTIFIER_GET_IDENTIFIER(identifier, env); } @@ -608,7 +608,7 @@ sleep(300000);*/ } - transaction = SANDESHA2_STORAGE_MGR_GET_TRANSACTION(storage_mgr, + transaction = sandesha2_storage_mgr_get_transaction(storage_mgr, env); property = axis2_property_create(env); AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST); @@ -640,7 +640,7 @@ /* Removing the message from the storage */ msg_stored_key = SANDESHA2_SENDER_BEAN_GET_MSG_CONTEXT_REF_KEY( bean1, env); - SANDESHA2_STORAGE_MGR_REMOVE_MSG_CTX(storage_mgr, env, + sandesha2_storage_mgr_remove_msg_ctx(storage_mgr, env, msg_stored_key); } } @@ -661,7 +661,7 @@ 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, + sandesha2_terminate_seq_get_identifier(terminate_seq, env), env); conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env); int_seq_id = sandesha2_utils_get_seq_property(env, seq_id, Modified: webservices/sandesha/trunk/c/src/wsrm/Makefile.am URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/Makefile.am?view=diff&rev=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/Makefile.am (original) +++ webservices/sandesha/trunk/c/src/wsrm/Makefile.am Wed Nov 8 19:48:04 2006 @@ -25,7 +25,8 @@ terminate_seq.c\ terminate_seq_res.c\ rm_elements.c \ - iom_rm_element.c + iom_rm_element.c \ + iom_rm_part.c INCLUDES = -I$(top_builddir)/include \ @AXIS2INC@ Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq.c?view=diff&rev=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/close_seq.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/close_seq.c Wed Nov 8 19:48:04 2006 @@ -52,15 +52,6 @@ sandesha2_iom_rm_element_t *close_seq, const axis2_env_t *env, axis2_char_t *namespace); -sandesha2_identifier_t * AXIS2_CALL -sandesha2_close_seq_get_identifier(sandesha2_close_seq_t *close_seq, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_close_seq_set_identifier(sandesha2_close_seq_t *close_seq, - const axis2_env_t *env, - sandesha2_identifier_t *identifier); - axis2_status_t AXIS2_CALL sandesha2_close_seq_to_soap_env(sandesha2_iom_rm_part_t *close_seq, const axis2_env_t *env, axiom_soap_envelope_t *envelope); @@ -96,19 +87,9 @@ } close_seq_impl->ns_val = NULL; close_seq_impl->identifier = NULL; - close_seq_impl->close_seq.ops = NULL; close_seq_impl->close_seq.part.ops = NULL; close_seq_impl->close_seq.part.element.ops = NULL; - close_seq_impl->close_seq.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_close_seq_ops_t)); - if(NULL == close_seq_impl->close_seq.ops) - { - sandesha2_close_seq_free((sandesha2_iom_rm_element_t*) - close_seq_impl, env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); - return NULL; - } close_seq_impl->close_seq.part.ops = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_iom_rm_part_ops_t)); if(NULL == close_seq_impl->close_seq.part.ops) @@ -139,10 +120,6 @@ sandesha2_close_seq_is_namespace_supported; close_seq_impl->close_seq.part.ops->to_soap_env = sandesha2_close_seq_to_soap_env; - close_seq_impl->close_seq.ops->set_identifier = - sandesha2_close_seq_set_identifier; - close_seq_impl->close_seq.ops->get_identifier = - sandesha2_close_seq_get_identifier; close_seq_impl->close_seq.part.element.ops->free = sandesha2_close_seq_free; return &(close_seq_impl->close_seq); @@ -150,8 +127,9 @@ axis2_status_t AXIS2_CALL -sandesha2_close_seq_free (sandesha2_iom_rm_element_t *close_seq, - const axis2_env_t *env) +sandesha2_close_seq_free ( + sandesha2_iom_rm_element_t *close_seq, + const axis2_env_t *env) { sandesha2_close_seq_impl_t *close_seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -183,8 +161,9 @@ } axis2_char_t* AXIS2_CALL -sandesha2_close_seq_get_namespace_value (sandesha2_iom_rm_element_t *close_seq, - const axis2_env_t *env) +sandesha2_close_seq_get_namespace_value ( + sandesha2_iom_rm_element_t *close_seq, + const axis2_env_t *env) { sandesha2_close_seq_impl_t *close_seq_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -195,8 +174,10 @@ void* AXIS2_CALL -sandesha2_close_seq_from_om_node(sandesha2_iom_rm_element_t *close_seq, - const axis2_env_t *env, axiom_node_t *om_node) +sandesha2_close_seq_from_om_node( + sandesha2_iom_rm_element_t *close_seq, + const axis2_env_t *env, + axiom_node_t *om_node) { sandesha2_close_seq_impl_t *close_seq_impl = NULL; axiom_element_t *om_element = NULL; @@ -247,8 +228,9 @@ axiom_node_t* AXIS2_CALL -sandesha2_close_seq_to_om_node(sandesha2_iom_rm_element_t *close_seq, - const axis2_env_t *env, void *om_node) +sandesha2_close_seq_to_om_node( + sandesha2_iom_rm_element_t *close_seq, + const axis2_env_t *env, void *om_node) { sandesha2_close_seq_impl_t *close_seq_impl = NULL; axiom_namespace_t *rm_ns = NULL; @@ -285,8 +267,10 @@ } axis2_bool_t AXIS2_CALL -sandesha2_close_seq_is_namespace_supported(sandesha2_iom_rm_element_t *close_seq, - const axis2_env_t *env, axis2_char_t *namespace) +sandesha2_close_seq_is_namespace_supported( + sandesha2_iom_rm_element_t *close_seq, + const axis2_env_t *env, + axis2_char_t *namespace) { sandesha2_close_seq_impl_t *close_seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -304,8 +288,9 @@ } sandesha2_identifier_t * AXIS2_CALL -sandesha2_close_seq_get_identifier(sandesha2_close_seq_t *element, - const axis2_env_t *env) +sandesha2_close_seq_get_identifier( + sandesha2_close_seq_t *element, + const axis2_env_t *env) { sandesha2_close_seq_impl_t *close_seq_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -316,9 +301,10 @@ } axis2_status_t AXIS2_CALL -sandesha2_close_seq_set_identifier(sandesha2_close_seq_t *close_seq, - const axis2_env_t *env, - sandesha2_identifier_t *identifier) +sandesha2_close_seq_set_identifier( + sandesha2_close_seq_t *close_seq, + const axis2_env_t *env, + sandesha2_identifier_t *identifier) { sandesha2_close_seq_impl_t *close_seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -336,8 +322,10 @@ } axis2_status_t AXIS2_CALL -sandesha2_close_seq_to_soap_env(sandesha2_iom_rm_part_t *close_seq, - const axis2_env_t *env, axiom_soap_envelope_t *envelope) +sandesha2_close_seq_to_soap_env( + sandesha2_iom_rm_part_t *close_seq, + const axis2_env_t *env, + axiom_soap_envelope_t *envelope) { sandesha2_close_seq_impl_t *close_seq_impl = NULL; axiom_node_t *body_node = NULL; @@ -365,3 +353,4 @@ body_node); return AXIS2_SUCCESS; } + Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c?view=diff&rev=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c Wed Nov 8 19:48:04 2006 @@ -55,15 +55,6 @@ sandesha2_iom_rm_element_t *close_seq_res, const axis2_env_t *env, axis2_char_t *namespace); -sandesha2_identifier_t * AXIS2_CALL -sandesha2_close_seq_res_get_identifier(sandesha2_close_seq_res_t *close_seq_res, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_close_seq_res_set_identifier(sandesha2_close_seq_res_t *close_seq_res, - const axis2_env_t *env, - sandesha2_identifier_t *identifier); - axis2_status_t AXIS2_CALL sandesha2_close_seq_res_to_soap_env(sandesha2_iom_rm_part_t *close_seq_res, const axis2_env_t *env, axiom_soap_envelope_t *envelope); @@ -100,20 +91,9 @@ } close_seq_res_impl->ns_val = NULL; close_seq_res_impl->identifier = NULL; - close_seq_res_impl->close_seq_res.ops = NULL; close_seq_res_impl->close_seq_res.part.ops = NULL; close_seq_res_impl->close_seq_res.part.element.ops = NULL; - - close_seq_res_impl->close_seq_res.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_close_seq_res_ops_t)); - if(NULL == close_seq_res_impl->close_seq_res.ops) - { - sandesha2_close_seq_res_free((sandesha2_iom_rm_element_t*) - close_seq_res_impl, env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); - return NULL; - } close_seq_res_impl->close_seq_res.part.ops = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_iom_rm_part_ops_t)); if(NULL == close_seq_res_impl->close_seq_res.part.ops) @@ -145,10 +125,6 @@ sandesha2_close_seq_res_is_namespace_supported; close_seq_res_impl->close_seq_res.part.ops->to_soap_env = sandesha2_close_seq_res_to_soap_env; - close_seq_res_impl->close_seq_res.ops->set_identifier = - sandesha2_close_seq_res_set_identifier; - close_seq_res_impl->close_seq_res.ops->get_identifier = - sandesha2_close_seq_res_get_identifier; close_seq_res_impl->close_seq_res.part.element.ops->free = sandesha2_close_seq_res_free; @@ -175,11 +151,6 @@ AXIS2_FREE(env->allocator, close_seq_res->ops); close_seq_res->ops = NULL; } - if(NULL != close_seq_res_impl->close_seq_res.ops) - { - AXIS2_FREE(env->allocator, close_seq_res_impl->close_seq_res.ops); - close_seq_res_impl->close_seq_res.ops = NULL; - } if(NULL != close_seq_res_impl->close_seq_res.part.ops) { AXIS2_FREE(env->allocator, close_seq_res_impl->close_seq_res.part.ops); @@ -312,8 +283,9 @@ } sandesha2_identifier_t * AXIS2_CALL -sandesha2_close_seq_res_get_identifier(sandesha2_close_seq_res_t *close_seq_res, - const axis2_env_t *env) +sandesha2_close_seq_res_get_identifier( + sandesha2_close_seq_res_t *close_seq_res, + const axis2_env_t *env) { sandesha2_close_seq_res_impl_t *close_seq_res_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -324,9 +296,10 @@ } axis2_status_t AXIS2_CALL -sandesha2_close_seq_res_set_identifier(sandesha2_close_seq_res_t *close_seq_res, - const axis2_env_t *env, - sandesha2_identifier_t *identifier) +sandesha2_close_seq_res_set_identifier( + sandesha2_close_seq_res_t *close_seq_res, + const axis2_env_t *env, + sandesha2_identifier_t *identifier) { sandesha2_close_seq_res_impl_t *close_seq_res_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); Modified: webservices/sandesha/trunk/c/src/wsrm/expires.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/expires.c?view=diff&rev=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/expires.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/expires.c Wed Nov 8 19:48:04 2006 @@ -34,31 +34,23 @@ ((sandesha2_expires_impl_t *)(expires)) /***************************** Function headers *******************************/ -axis2_char_t* AXIS2_CALL +static axis2_char_t* AXIS2_CALL sandesha2_expires_get_namespace_value (sandesha2_iom_rm_element_t *expires, const axis2_env_t *env); -void* AXIS2_CALL +static void* AXIS2_CALL sandesha2_expires_from_om_node(sandesha2_iom_rm_element_t *expires, const axis2_env_t *env, axiom_node_t *om_node); -axiom_node_t* AXIS2_CALL +static axiom_node_t* AXIS2_CALL sandesha2_expires_to_om_node(sandesha2_iom_rm_element_t *expires, const axis2_env_t *env, void *om_node); -axis2_bool_t AXIS2_CALL +static axis2_bool_t AXIS2_CALL sandesha2_expires_is_namespace_supported(sandesha2_iom_rm_element_t *expires, const axis2_env_t *env, axis2_char_t *namespace); -axis2_char_t * AXIS2_CALL -sandesha2_expires_get_duration(sandesha2_expires_t *expires, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_expires_set_duration(sandesha2_expires_t *expires, - const axis2_env_t *env, axis2_char_t *duration); - -axis2_status_t AXIS2_CALL +static axis2_status_t AXIS2_CALL sandesha2_expires_free (sandesha2_iom_rm_element_t *expires, const axis2_env_t *env); @@ -90,7 +82,6 @@ expires_impl->ns_val = NULL; expires_impl->duration = NULL; expires_impl->expires.element.ops = NULL; - expires_impl->expires.ops = NULL; expires_impl->expires.element.ops = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_iom_rm_element_ops_t)); @@ -101,15 +92,6 @@ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } - expires_impl->expires.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_expires_ops_t)); - if(NULL == expires_impl->expires.ops) - { - sandesha2_expires_free((sandesha2_iom_rm_element_t*) - expires_impl, env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); - return NULL; - } expires_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); expires_impl->expires.element.ops->get_namespace_value = @@ -120,38 +102,32 @@ sandesha2_expires_to_om_node; expires_impl->expires.element.ops->is_namespace_supported = sandesha2_expires_is_namespace_supported; - expires_impl->expires.ops->get_duration = sandesha2_expires_get_duration; - expires_impl->expires.ops->set_duration = sandesha2_expires_set_duration; expires_impl->expires.element.ops->free = sandesha2_expires_free; return &(expires_impl->expires); } -axis2_status_t AXIS2_CALL -sandesha2_expires_free (sandesha2_iom_rm_element_t *expires, - const axis2_env_t *env) +static axis2_status_t AXIS2_CALL +sandesha2_expires_free ( + sandesha2_iom_rm_element_t *expires, + const axis2_env_t *env) { sandesha2_expires_impl_t *expires_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); expires_impl = SANDESHA2_INTF_TO_IMPL(expires); - if(NULL != expires_impl->ns_val) + if(expires_impl->ns_val) { AXIS2_FREE(env->allocator, expires_impl->ns_val); expires_impl->ns_val = NULL; } - if(NULL != expires_impl->duration) + if(expires_impl->duration) { AXIS2_FREE(env->allocator, expires_impl->duration); expires_impl->duration = NULL; } - if(NULL != expires->ops) - { - AXIS2_FREE(env->allocator, expires->ops); - expires->ops = NULL; - } - if(NULL != expires_impl->expires.element.ops) + if(expires_impl->expires.element.ops) { AXIS2_FREE(env->allocator, expires_impl->expires.element.ops); expires_impl->expires.element.ops = NULL; @@ -160,9 +136,10 @@ return AXIS2_SUCCESS; } -axis2_char_t* AXIS2_CALL -sandesha2_expires_get_namespace_value (sandesha2_iom_rm_element_t *expires, - const axis2_env_t *env) +static axis2_char_t* AXIS2_CALL +sandesha2_expires_get_namespace_value ( + sandesha2_iom_rm_element_t *expires, + const axis2_env_t *env) { sandesha2_expires_impl_t *expires_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -172,9 +149,11 @@ } -void* AXIS2_CALL -sandesha2_expires_from_om_node(sandesha2_iom_rm_element_t *expires, - const axis2_env_t *env, axiom_node_t *om_node) +static void* AXIS2_CALL +sandesha2_expires_from_om_node( + sandesha2_iom_rm_element_t *expires, + const axis2_env_t *env, + axiom_node_t *om_node) { sandesha2_expires_impl_t *expires_impl = NULL; axiom_element_t *om_element = NULL; @@ -231,9 +210,11 @@ } -axiom_node_t* AXIS2_CALL -sandesha2_expires_to_om_node(sandesha2_iom_rm_element_t *expires, - const axis2_env_t *env, void *om_node) +static axiom_node_t* AXIS2_CALL +sandesha2_expires_to_om_node( + sandesha2_iom_rm_element_t *expires, + const axis2_env_t *env, + void *om_node) { sandesha2_expires_impl_t *expires_impl = NULL; axiom_namespace_t *rm_ns = NULL; @@ -269,9 +250,11 @@ return (axiom_node_t*)om_node; } -axis2_bool_t AXIS2_CALL -sandesha2_expires_is_namespace_supported(sandesha2_iom_rm_element_t *expires, - const axis2_env_t *env, axis2_char_t *namespace) +static axis2_bool_t AXIS2_CALL +sandesha2_expires_is_namespace_supported( + sandesha2_iom_rm_element_t *expires, + const axis2_env_t *env, + axis2_char_t *namespace) { sandesha2_expires_impl_t *expires_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -289,8 +272,9 @@ } axis2_char_t * AXIS2_CALL -sandesha2_expires_get_duration(sandesha2_expires_t *expires, - const axis2_env_t *env) +sandesha2_expires_get_duration( + sandesha2_expires_t *expires, + const axis2_env_t *env) { sandesha2_expires_impl_t *expires_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -302,8 +286,10 @@ axis2_status_t AXIS2_CALL -sandesha2_expires_set_duration(sandesha2_expires_t *expires, - const axis2_env_t *env, axis2_char_t *duration) +sandesha2_expires_set_duration( + sandesha2_expires_t *expires, + const axis2_env_t *env, + axis2_char_t *duration) { sandesha2_expires_impl_t *expires_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -312,3 +298,4 @@ expires_impl->duration = duration; return AXIS2_SUCCESS; } + Modified: webservices/sandesha/trunk/c/src/wsrm/fault_code.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/fault_code.c?view=diff&rev=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/fault_code.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/fault_code.c Wed Nov 8 19:48:04 2006 @@ -50,14 +50,6 @@ sandesha2_fault_code_is_namespace_supported( sandesha2_iom_rm_element_t *fault_code, const axis2_env_t *env, axis2_char_t *namespace); - -axis2_char_t * AXIS2_CALL -sandesha2_fault_code_get_fault_code(sandesha2_fault_code_t *fault_code, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_fault_code_set_fault_code(sandesha2_fault_code_t *fault_code, - const axis2_env_t *env, axis2_char_t *str_fault_code); axis2_status_t AXIS2_CALL sandesha2_fault_code_free (sandesha2_iom_rm_element_t *fault_code, @@ -90,18 +82,8 @@ } fault_code_impl->ns_val = NULL; fault_code_impl->str_fault_code = NULL; - fault_code_impl->fault_code.ops = NULL; fault_code_impl->fault_code.element.ops = NULL; - fault_code_impl->fault_code.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_fault_code_ops_t)); - if(NULL == fault_code_impl->fault_code.ops) - { - sandesha2_fault_code_free((sandesha2_iom_rm_element_t*) - fault_code_impl, env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); - return NULL; - } fault_code_impl->fault_code.element.ops = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_iom_rm_element_ops_t)); if(NULL == fault_code_impl->fault_code.element.ops) @@ -121,10 +103,6 @@ sandesha2_fault_code_to_om_node; fault_code_impl->fault_code.element.ops->is_namespace_supported = sandesha2_fault_code_is_namespace_supported; - fault_code_impl->fault_code.ops->get_fault_code = - sandesha2_fault_code_get_fault_code; - fault_code_impl->fault_code.ops->set_fault_code = - sandesha2_fault_code_set_fault_code; fault_code_impl->fault_code.element.ops->free = sandesha2_fault_code_free; return &(fault_code_impl->fault_code); @@ -148,11 +126,6 @@ { AXIS2_FREE(env->allocator, fault_code_impl->str_fault_code); fault_code_impl->str_fault_code = NULL; - } - if(NULL != fault_code->ops) - { - AXIS2_FREE(env->allocator, fault_code->ops); - fault_code->ops = NULL; } if(NULL != fault_code_impl->fault_code.element.ops) { Modified: webservices/sandesha/trunk/c/src/wsrm/seq_ack.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_ack.c?view=diff&rev=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Wed Nov 8 19:48:04 2006 @@ -42,76 +42,33 @@ ((sandesha2_seq_ack_impl_t *)(seq_ack)) /***************************** Function headers *******************************/ -axis2_char_t* AXIS2_CALL +static axis2_char_t* AXIS2_CALL sandesha2_seq_ack_get_namespace_value ( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env); -void* AXIS2_CALL +static void* AXIS2_CALL sandesha2_seq_ack_from_om_node( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env, axiom_node_t *om_node); -axiom_node_t* AXIS2_CALL +static axiom_node_t* AXIS2_CALL sandesha2_seq_ack_to_om_node( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env, void *om_node); -axis2_bool_t AXIS2_CALL +static axis2_bool_t AXIS2_CALL sandesha2_seq_ack_is_namespace_supported( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env, axis2_char_t *namespace); -sandesha2_identifier_t * AXIS2_CALL -sandesha2_seq_ack_get_identifier( - sandesha2_seq_ack_t *seq_ack, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_seq_ack_set_identifier( - sandesha2_seq_ack_t *seq_ack, - const axis2_env_t *env, - sandesha2_identifier_t *identifier); - -axis2_array_list_t * AXIS2_CALL -sandesha2_seq_ack_get_nack_list( - sandesha2_seq_ack_t *seq_ack, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_seq_ack_set_ack_final( - sandesha2_seq_ack_t *seq_ack, - const axis2_env_t *env, - sandesha2_ack_final_t *ack_final); - -axis2_array_list_t * AXIS2_CALL -sandesha2_seq_ack_get_ack_range_list( - sandesha2_seq_ack_t *seq_ack, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_seq_ack_add_ack_range( - sandesha2_seq_ack_t *seq_ack, - const axis2_env_t *env, - sandesha2_ack_range_t *ack_range); - -axis2_status_t AXIS2_CALL +static axis2_status_t AXIS2_CALL sandesha2_seq_ack_to_soap_env( sandesha2_iom_rm_part_t *seq_ack, const axis2_env_t *env, axiom_soap_envelope_t *envelope); -axis2_bool_t AXIS2_CALL -sandesha2_seq_ack_is_must_understand( - sandesha2_seq_ack_t *seq_ack, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_seq_ack_set_must_understand( - sandesha2_seq_ack_t *seq_ack, - const axis2_env_t *env, axis2_bool_t mu); - -axis2_status_t AXIS2_CALL +static axis2_status_t AXIS2_CALL sandesha2_seq_ack_free ( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env); @@ -147,19 +104,9 @@ seq_ack_impl->ack_none = NULL; seq_ack_impl->ack_final = NULL; seq_ack_impl->must_understand = AXIS2_FALSE; - seq_ack_impl->seq_ack.ops = NULL; seq_ack_impl->seq_ack.part.ops = NULL; seq_ack_impl->seq_ack.part.element.ops = NULL; - seq_ack_impl->seq_ack.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_seq_ack_ops_t)); - if(NULL == seq_ack_impl->seq_ack.ops) - { - sandesha2_seq_ack_free((sandesha2_iom_rm_element_t*) - seq_ack_impl, env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); - return NULL; - } seq_ack_impl->seq_ack.part.ops = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_iom_rm_part_ops_t)); if(NULL == seq_ack_impl->seq_ack.part.ops) @@ -193,29 +140,13 @@ seq_ack_impl->seq_ack.part.element.ops->is_namespace_supported = sandesha2_seq_ack_is_namespace_supported; seq_ack_impl->seq_ack.part.ops->to_soap_env = sandesha2_seq_ack_to_soap_env; - seq_ack_impl->seq_ack.ops->get_identifier = - sandesha2_seq_ack_get_identifier; - seq_ack_impl->seq_ack.ops->set_identifier = - sandesha2_seq_ack_set_identifier; - seq_ack_impl->seq_ack.ops->get_nack_list = - sandesha2_seq_ack_get_nack_list; - seq_ack_impl->seq_ack.ops->set_ack_final = - sandesha2_seq_ack_set_ack_final; - seq_ack_impl->seq_ack.ops->get_ack_range_list = - sandesha2_seq_ack_get_ack_range_list; - seq_ack_impl->seq_ack.ops->add_ack_range = - sandesha2_seq_ack_add_ack_range; - seq_ack_impl->seq_ack.ops->set_must_understand = - sandesha2_seq_ack_set_must_understand; - seq_ack_impl->seq_ack.ops->is_must_understand = - sandesha2_seq_ack_is_must_understand; seq_ack_impl->seq_ack.part.element.ops->free = sandesha2_seq_ack_free; return &(seq_ack_impl->seq_ack); } -axis2_status_t AXIS2_CALL +static axis2_status_t AXIS2_CALL sandesha2_seq_ack_free ( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env) @@ -244,16 +175,6 @@ AXIS2_ARRAY_LIST_FREE(seq_ack_impl->nack_list, env); seq_ack_impl->nack_list = NULL; } - if(NULL != seq_ack->ops) - { - AXIS2_FREE(env->allocator, seq_ack->ops); - seq_ack->ops = NULL; - } - if(NULL != seq_ack_impl->seq_ack.ops) - { - AXIS2_FREE(env->allocator, seq_ack_impl->seq_ack.ops); - seq_ack_impl->seq_ack.ops = NULL; - } if(NULL != seq_ack_impl->seq_ack.part.ops) { AXIS2_FREE(env->allocator, seq_ack_impl->seq_ack.part.ops); @@ -263,7 +184,7 @@ return AXIS2_SUCCESS; } -axis2_char_t* AXIS2_CALL +static axis2_char_t* AXIS2_CALL sandesha2_seq_ack_get_namespace_value ( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env) @@ -276,7 +197,7 @@ } -void* AXIS2_CALL +static void* AXIS2_CALL sandesha2_seq_ack_from_om_node( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env, @@ -448,7 +369,7 @@ } -axiom_node_t* AXIS2_CALL +static axiom_node_t* AXIS2_CALL sandesha2_seq_ack_to_om_node( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env, void *om_node) @@ -558,7 +479,7 @@ return sa_node; } -axis2_bool_t AXIS2_CALL +static axis2_bool_t AXIS2_CALL sandesha2_seq_ack_is_namespace_supported( sandesha2_iom_rm_element_t *seq_ack, const axis2_env_t *env, axis2_char_t *namespace) @@ -686,7 +607,7 @@ } -axis2_status_t AXIS2_CALL +static axis2_status_t AXIS2_CALL sandesha2_seq_ack_to_soap_env( sandesha2_iom_rm_part_t *seq_ack, const axis2_env_t *env, axiom_soap_envelope_t *envelope) Modified: webservices/sandesha/trunk/c/src/wsrm/sequence.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/sequence.c?view=diff&rev=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Wed Nov 8 19:48:04 2006 @@ -39,63 +39,27 @@ ((sandesha2_seq_impl_t *)(seq)) /***************************** Function headers *******************************/ -axis2_char_t* AXIS2_CALL +static axis2_char_t* AXIS2_CALL sandesha2_seq_get_namespace_value (sandesha2_iom_rm_element_t *seq, const axis2_env_t *env); -void* AXIS2_CALL +static void* AXIS2_CALL sandesha2_seq_from_om_node(sandesha2_iom_rm_element_t *seq, const axis2_env_t *env, axiom_node_t *om_node); -axiom_node_t* AXIS2_CALL +static axiom_node_t* AXIS2_CALL sandesha2_seq_to_om_node(sandesha2_iom_rm_element_t *seq, const axis2_env_t *env, void *om_node); -axis2_bool_t AXIS2_CALL +static axis2_bool_t AXIS2_CALL sandesha2_seq_is_namespace_supported(sandesha2_iom_rm_element_t *seq, const axis2_env_t *env, axis2_char_t *namespace); - -sandesha2_identifier_t * AXIS2_CALL -sandesha2_seq_get_identifier(sandesha2_seq_t *seq, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_seq_set_identifier(sandesha2_seq_t *seq, - const axis2_env_t *env, - sandesha2_identifier_t *identifier); - -sandesha2_msg_number_t * AXIS2_CALL -sandesha2_seq_get_msg_num(sandesha2_seq_t *seq, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_seq_set_msg_num(sandesha2_seq_t *seq, - const axis2_env_t *env, - sandesha2_msg_number_t *msg_num); - -sandesha2_last_msg_t * AXIS2_CALL -sandesha2_seq_get_last_msg(sandesha2_seq_t *seq, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_seq_set_last_msg(sandesha2_seq_t *seq, - const axis2_env_t *env, - sandesha2_last_msg_t *last_msg); - -axis2_bool_t AXIS2_CALL -sandesha2_seq_is_must_understand(sandesha2_seq_t *seq, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_seq_set_must_understand(sandesha2_seq_t *seq, - const axis2_env_t *env, axis2_bool_t mu); - -axis2_status_t AXIS2_CALL +static axis2_status_t AXIS2_CALL sandesha2_seq_to_soap_env(sandesha2_iom_rm_part_t *seq, const axis2_env_t *env, axiom_soap_envelope_t *envelope); -axis2_status_t AXIS2_CALL +static axis2_status_t AXIS2_CALL sandesha2_seq_free (sandesha2_iom_rm_element_t *seq, const axis2_env_t *env); @@ -129,19 +93,9 @@ seq_impl->msg_num = NULL; seq_impl->last_msg = NULL; seq_impl->must_understand = AXIS2_TRUE; - seq_impl->seq.ops = NULL; seq_impl->seq.part.ops = NULL; seq_impl->seq.part.element.ops = NULL; - seq_impl->seq.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_seq_ops_t)); - if(NULL == seq_impl->seq.ops) - { - sandesha2_seq_free((sandesha2_iom_rm_element_t*) - seq_impl, env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); - return NULL; - } seq_impl->seq.part.ops = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_iom_rm_part_ops_t)); if(NULL == seq_impl->seq.part.ops) @@ -173,22 +127,6 @@ sandesha2_seq_is_namespace_supported; seq_impl->seq.part.ops->to_soap_env = sandesha2_seq_to_soap_env; - seq_impl->seq.ops->set_identifier = - sandesha2_seq_set_identifier; - seq_impl->seq.ops->get_identifier = - sandesha2_seq_get_identifier; - seq_impl->seq.ops->set_last_msg = - sandesha2_seq_set_last_msg; - seq_impl->seq.ops->get_last_msg = - sandesha2_seq_get_last_msg; - seq_impl->seq.ops->set_must_understand = - sandesha2_seq_set_must_understand; - seq_impl->seq.ops->is_must_understand = - sandesha2_seq_is_must_understand; - seq_impl->seq.ops->get_msg_num = - sandesha2_seq_get_msg_num; - seq_impl->seq.ops->set_msg_num = - sandesha2_seq_set_msg_num; seq_impl->seq.part.element.ops->free = sandesha2_seq_free; @@ -207,7 +145,7 @@ return sandesha2_seq_free(seq_l, env); } -axis2_status_t AXIS2_CALL +static axis2_status_t AXIS2_CALL sandesha2_seq_free ( sandesha2_iom_rm_element_t *seq, const axis2_env_t *env) @@ -231,9 +169,10 @@ return AXIS2_SUCCESS; } -axis2_char_t* AXIS2_CALL -sandesha2_seq_get_namespace_value (sandesha2_iom_rm_element_t *seq, - const axis2_env_t *env) +static axis2_char_t* AXIS2_CALL +sandesha2_seq_get_namespace_value ( + sandesha2_iom_rm_element_t *seq, + const axis2_env_t *env) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -243,9 +182,11 @@ } -void* AXIS2_CALL -sandesha2_seq_from_om_node(sandesha2_iom_rm_element_t *seq, - const axis2_env_t *env, axiom_node_t *om_node) +static void* AXIS2_CALL +sandesha2_seq_from_om_node( + sandesha2_iom_rm_element_t *seq, + const axis2_env_t *env, + axiom_node_t *om_node) { sandesha2_seq_impl_t *seq_impl = NULL; axiom_element_t *om_element = NULL; @@ -319,10 +260,10 @@ } -axiom_node_t* AXIS2_CALL +static axiom_node_t* AXIS2_CALL sandesha2_seq_to_om_node( - sandesha2_iom_rm_element_t *seq, - const axis2_env_t *env, void *om_node) + sandesha2_iom_rm_element_t *seq, + const axis2_env_t *env, void *om_node) { sandesha2_seq_impl_t *seq_impl = NULL; axiom_namespace_t *rm_ns = NULL; @@ -364,9 +305,10 @@ return seq_node; } -axis2_bool_t AXIS2_CALL -sandesha2_seq_is_namespace_supported(sandesha2_iom_rm_element_t *seq, - const axis2_env_t *env, axis2_char_t *namespace) +static axis2_bool_t AXIS2_CALL +sandesha2_seq_is_namespace_supported( + sandesha2_iom_rm_element_t *seq, + const axis2_env_t *env, axis2_char_t *namespace) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -384,8 +326,9 @@ } sandesha2_identifier_t * AXIS2_CALL -sandesha2_seq_get_identifier(sandesha2_seq_t *element, - const axis2_env_t *env) +sandesha2_seq_get_identifier( + sandesha2_seq_t *element, + const axis2_env_t *env) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -396,9 +339,10 @@ } axis2_status_t AXIS2_CALL -sandesha2_seq_set_identifier(sandesha2_seq_t *seq, - const axis2_env_t *env, - sandesha2_identifier_t *identifier) +sandesha2_seq_set_identifier( + sandesha2_seq_t *seq, + const axis2_env_t *env, + sandesha2_identifier_t *identifier) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -409,8 +353,9 @@ } sandesha2_msg_number_t * AXIS2_CALL -sandesha2_seq_get_msg_num(sandesha2_seq_t *seq, - const axis2_env_t *env) +sandesha2_seq_get_msg_num( + sandesha2_seq_t *seq, + const axis2_env_t *env) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -421,8 +366,9 @@ } axis2_status_t AXIS2_CALL -sandesha2_seq_set_msg_num(sandesha2_seq_t *seq, - const axis2_env_t *env, sandesha2_msg_number_t *msg_num) +sandesha2_seq_set_msg_num( + sandesha2_seq_t *seq, + const axis2_env_t *env, sandesha2_msg_number_t *msg_num) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -433,8 +379,9 @@ } sandesha2_last_msg_t * AXIS2_CALL -sandesha2_seq_get_last_msg(sandesha2_seq_t *seq, - const axis2_env_t *env) +sandesha2_seq_get_last_msg( + sandesha2_seq_t *seq, + const axis2_env_t *env) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -445,8 +392,9 @@ } axis2_status_t AXIS2_CALL -sandesha2_seq_set_last_msg(sandesha2_seq_t *seq, - const axis2_env_t *env, sandesha2_last_msg_t *last_msg) +sandesha2_seq_set_last_msg( + sandesha2_seq_t *seq, + const axis2_env_t *env, sandesha2_last_msg_t *last_msg) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -457,8 +405,9 @@ } axis2_bool_t AXIS2_CALL -sandesha2_seq_is_must_understand(sandesha2_seq_t *seq, - const axis2_env_t *env) +sandesha2_seq_is_must_understand( + sandesha2_seq_t *seq, + const axis2_env_t *env) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FALSE); @@ -468,8 +417,9 @@ } axis2_status_t AXIS2_CALL -sandesha2_seq_set_must_understand(sandesha2_seq_t *seq, - const axis2_env_t *env, axis2_bool_t mu) +sandesha2_seq_set_must_understand( + sandesha2_seq_t *seq, + const axis2_env_t *env, axis2_bool_t mu) { sandesha2_seq_impl_t *seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); @@ -480,9 +430,10 @@ } -axis2_status_t AXIS2_CALL -sandesha2_seq_to_soap_env(sandesha2_iom_rm_part_t *seq, - const axis2_env_t *env, axiom_soap_envelope_t *envelope) +static axis2_status_t AXIS2_CALL +sandesha2_seq_to_soap_env( + sandesha2_iom_rm_part_t *seq, + const axis2_env_t *env, axiom_soap_envelope_t *envelope) { sandesha2_seq_impl_t *seq_impl = NULL; axiom_soap_header_t *soap_header = NULL; @@ -507,3 +458,4 @@ soap_header); return AXIS2_SUCCESS; } + Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c?view=diff&rev=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c Wed Nov 8 19:48:04 2006 @@ -54,15 +54,6 @@ sandesha2_iom_rm_element_t *terminate_seq, const axis2_env_t *env, axis2_char_t *namespace); -sandesha2_identifier_t * AXIS2_CALL -sandesha2_terminate_seq_get_identifier(sandesha2_terminate_seq_t *terminate_seq, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_terminate_seq_set_identifier(sandesha2_terminate_seq_t *terminate_seq, - const axis2_env_t *env, - sandesha2_identifier_t *identifier); - axis2_status_t AXIS2_CALL sandesha2_terminate_seq_to_soap_env(sandesha2_iom_rm_part_t *terminate_seq, const axis2_env_t *env, @@ -99,19 +90,9 @@ } terminate_seq_impl->ns_val = NULL; terminate_seq_impl->identifier = NULL; - terminate_seq_impl->terminate_seq.ops = NULL; terminate_seq_impl->terminate_seq.part.ops = NULL; terminate_seq_impl->terminate_seq.part.element.ops = NULL; - terminate_seq_impl->terminate_seq.ops = AXIS2_MALLOC(env->allocator, - sizeof(sandesha2_terminate_seq_ops_t)); - if(NULL == terminate_seq_impl->terminate_seq.ops) - { - sandesha2_terminate_seq_free((sandesha2_iom_rm_element_t*) - terminate_seq_impl, env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); - return NULL; - } terminate_seq_impl->terminate_seq.part.ops = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_iom_rm_part_ops_t)); if(NULL == terminate_seq_impl->terminate_seq.part.ops) @@ -142,10 +123,6 @@ sandesha2_terminate_seq_is_namespace_supported; terminate_seq_impl->terminate_seq.part.ops->to_soap_env = sandesha2_terminate_seq_to_soap_env; - terminate_seq_impl->terminate_seq.ops->set_identifier = - sandesha2_terminate_seq_set_identifier; - terminate_seq_impl->terminate_seq.ops->get_identifier = - sandesha2_terminate_seq_get_identifier; terminate_seq_impl->terminate_seq.part.element.ops->free = sandesha2_terminate_seq_free; @@ -167,16 +144,6 @@ terminate_seq_impl->ns_val = NULL; } terminate_seq_impl->identifier = NULL; - if(NULL != terminate_seq->ops) - { - AXIS2_FREE(env->allocator, terminate_seq->ops); - terminate_seq->ops = NULL; - } - if(NULL != terminate_seq_impl->terminate_seq.ops) - { - AXIS2_FREE(env->allocator, terminate_seq_impl->terminate_seq.ops); - terminate_seq_impl->terminate_seq.ops = NULL; - } if(NULL != terminate_seq_impl->terminate_seq.part.ops) { AXIS2_FREE(env->allocator, terminate_seq_impl->terminate_seq.part.ops); @@ -305,8 +272,9 @@ } sandesha2_identifier_t * AXIS2_CALL -sandesha2_terminate_seq_get_identifier(sandesha2_terminate_seq_t *terminate_seq, - const axis2_env_t *env) +sandesha2_terminate_seq_get_identifier( + sandesha2_terminate_seq_t *terminate_seq, + const axis2_env_t *env) { sandesha2_terminate_seq_impl_t *terminate_seq_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -317,9 +285,10 @@ } axis2_status_t AXIS2_CALL -sandesha2_terminate_seq_set_identifier(sandesha2_terminate_seq_t *terminate_seq, - const axis2_env_t *env, - sandesha2_identifier_t *identifier) +sandesha2_terminate_seq_set_identifier( + sandesha2_terminate_seq_t *terminate_seq, + const axis2_env_t *env, + sandesha2_identifier_t *identifier) { sandesha2_terminate_seq_impl_t *terminate_seq_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c?view=diff&rev=472762&r1=472761&r2=472762 ============================================================================== --- webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c (original) +++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c Wed Nov 8 19:48:04 2006 @@ -58,17 +58,6 @@ sandesha2_iom_rm_element_t *terminate_seq_res, const axis2_env_t *env, axis2_char_t *namespace); -sandesha2_identifier_t * AXIS2_CALL -sandesha2_terminate_seq_res_get_identifier( - sandesha2_terminate_seq_res_t *terminate_seq_res, - const axis2_env_t *env); - -axis2_status_t AXIS2_CALL -sandesha2_terminate_seq_res_set_identifier( - sandesha2_terminate_seq_res_t *terminate_seq_res, - const axis2_env_t *env, - sandesha2_identifier_t *identifier); - axis2_status_t AXIS2_CALL sandesha2_terminate_seq_res_to_soap_env( sandesha2_iom_rm_part_t *terminate_seq_res, @@ -109,20 +98,9 @@ } terminate_seq_res_impl->ns_val = NULL; terminate_seq_res_impl->identifier = NULL; - terminate_seq_res_impl->terminate_seq_res.ops = NULL; terminate_seq_res_impl->terminate_seq_res.part.ops = NULL; terminate_seq_res_impl->terminate_seq_res.part.element.ops = NULL; - terminate_seq_res_impl->terminate_seq_res.ops = AXIS2_MALLOC( - env->allocator, - sizeof(sandesha2_terminate_seq_res_ops_t)); - if(NULL == terminate_seq_res_impl->terminate_seq_res.ops) - { - sandesha2_terminate_seq_res_free((sandesha2_iom_rm_element_t*) - terminate_seq_res_impl, env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); - return NULL; - } terminate_seq_res_impl->terminate_seq_res.part.ops = AXIS2_MALLOC( env->allocator, sizeof(sandesha2_iom_rm_part_ops_t)); @@ -136,13 +114,6 @@ terminate_seq_res_impl->terminate_seq_res.part.element.ops = AXIS2_MALLOC( env->allocator, sizeof(sandesha2_iom_rm_element_ops_t)); - if(NULL == terminate_seq_res_impl->terminate_seq_res.ops) - { - sandesha2_terminate_seq_res_free((sandesha2_iom_rm_element_t*) - terminate_seq_res_impl, env); - AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); - return NULL; - } terminate_seq_res_impl->ns_val = (axis2_char_t *)AXIS2_STRDUP(ns_val, env); @@ -158,10 +129,6 @@ sandesha2_terminate_seq_res_is_namespace_supported; terminate_seq_res_impl->terminate_seq_res.part.ops->to_soap_env = sandesha2_terminate_seq_res_to_soap_env; - terminate_seq_res_impl->terminate_seq_res.ops->set_identifier = - sandesha2_terminate_seq_res_set_identifier; - terminate_seq_res_impl->terminate_seq_res.ops->get_identifier = - sandesha2_terminate_seq_res_get_identifier; terminate_seq_res_impl->terminate_seq_res.part.element.ops->free = sandesha2_terminate_seq_res_free; @@ -183,23 +150,12 @@ terminate_seq_res_impl->ns_val = NULL; } terminate_seq_res_impl->identifier = NULL; - if(NULL != terminate_seq_res->ops) - { - AXIS2_FREE(env->allocator, terminate_seq_res->ops); - terminate_seq_res->ops = NULL; - } if(NULL != terminate_seq_res_impl->terminate_seq_res.part.ops) { AXIS2_FREE(env->allocator, terminate_seq_res_impl->terminate_seq_res.part.ops); terminate_seq_res_impl->terminate_seq_res.part.ops = NULL; } - if(NULL != terminate_seq_res_impl->terminate_seq_res.ops) - { - AXIS2_FREE(env->allocator, - terminate_seq_res_impl->terminate_seq_res.ops); - terminate_seq_res_impl->terminate_seq_res.part.ops = NULL; - } AXIS2_FREE(env->allocator, SANDESHA2_INTF_TO_IMPL(terminate_seq_res)); return AXIS2_SUCCESS; } @@ -324,8 +280,8 @@ sandesha2_identifier_t * AXIS2_CALL sandesha2_terminate_seq_res_get_identifier( - sandesha2_terminate_seq_res_t *terminate_seq_res, - const axis2_env_t *env) + sandesha2_terminate_seq_res_t *terminate_seq_res, + const axis2_env_t *env) { sandesha2_terminate_seq_res_impl_t *terminate_seq_res_impl = NULL; AXIS2_ENV_CHECK(env, NULL); @@ -337,9 +293,9 @@ axis2_status_t AXIS2_CALL sandesha2_terminate_seq_res_set_identifier( - sandesha2_terminate_seq_res_t *terminate_seq_res, - const axis2_env_t *env, - sandesha2_identifier_t *identifier) + sandesha2_terminate_seq_res_t *terminate_seq_res, + const axis2_env_t *env, + sandesha2_identifier_t *identifier) { sandesha2_terminate_seq_res_impl_t *terminate_seq_res_impl = NULL; AXIS2_ENV_CHECK(env, AXIS2_FAILURE); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
