You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/07 14:07:42 UTC
svn commit: r515557 - in /webservices/axis2/trunk/c: include/
modules/core/context/ modules/core/deployment/ modules/core/description/
modules/core/engine/ modules/core/phaseresolver/
Author: pini
Date: Wed Mar 7 05:07:40 2007
New Revision: 515557
URL: http://svn.apache.org/viewvc?view=rev&rev=515557
Log:
Dropped macros, fixed indentation.
Modified:
webservices/axis2/trunk/c/include/axis2_handler_desc.h
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/description/flow.c
webservices/axis2/trunk/c/modules/core/description/handler_desc.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/handler.c
webservices/axis2/trunk/c/modules/core/engine/phase.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
Modified: webservices/axis2/trunk/c/include/axis2_handler_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler_desc.h?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler_desc.h Wed Mar 7 05:07:40 2007
@@ -248,58 +248,6 @@
axis2_handler_desc_create(const axis2_env_t *env,
axis2_string_t *name);
-/** Gets handler associated with handler description. */
-#define AXIS2_HANDLER_DESC_GET_HANDLER(handler_desc, env) \
- axis2_handler_desc_get_handler(handler_desc, env)
-
-/** Sets handler associated with handler description. */
-#define AXIS2_HANDLER_DESC_SET_HANDLER(handler_desc, env, handler) \
- axis2_handler_desc_set_handler(handler_desc, env, handler)
-
-/** Gets rules. */
-#define AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env) \
- axis2_handler_desc_get_rules(handler_desc, env)
-
-/** Sets rules. */
-#define AXIS2_HANDLER_DESC_SET_RULES(handler_desc, env, rules) \
- axis2_handler_desc_set_rules(handler_desc, env, rules)
-
-/** Gets QName. */
-#define AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env) \
- axis2_handler_desc_get_name(handler_desc, env)
-
-/** Sets QName. */
-#define AXIS2_HANDLER_DESC_SET_NAME(handler_desc, env, name) \
- axis2_handler_desc_set_name(handler_desc, env, name)
-
-/** Gets parameter with given name. */
-#define AXIS2_HANDLER_DESC_GET_PARAM(handler_desc, env, name) \
- axis2_handler_desc_get_param(handler_desc, env, name)
-
-/** Adds parameter to parameter list. */
-#define AXIS2_HANDLER_DESC_ADD_PARAM(handler_desc, env, param) \
- axis2_handler_desc_add_param(handler_desc, env, param)
-
-/** Gets class name of handler. */
-#define AXIS2_HANDLER_DESC_GET_CLASS_NAME(handler_desc, env) \
- axis2_handler_desc_get_class_name(handler_desc, env)
-
-/** Sets class name of handler. */
-#define AXIS2_HANDLER_DESC_SET_CLASS_NAME(handler_desc, env, class_name) \
- axis2_handler_desc_set_class_name(handler_desc, env, class_name)
-
-/** Gets parent. */
-#define AXIS2_HANDLER_DESC_GET_PARENT(handler_desc, env) \
- axis2_handler_desc_get_parent(handler_desc, env)
-
-/** Sets parent. */
-#define AXIS2_HANDLER_DESC_SET_PARENT(handler_desc, env, parent) \
- axis2_handler_desc_set_parent(handler_desc, env, parent)
-
-/** Frees handler description. */
-#define AXIS2_HANDLER_DESC_FREE(handler_desc, env) \
- axis2_handler_desc_free(handler_desc, env)
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Wed Mar 7 05:07:40 2007
@@ -1313,7 +1313,7 @@
}
}
- param = AXIS2_HANDLER_DESC_GET_PARAM(handler_desc, env, key);
+ param = axis2_handler_desc_get_param(handler_desc, env, key);
return param;
*/
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Wed Mar 7 05:07:40 2007
@@ -487,7 +487,7 @@
handler = AXIS2_DISP_GET_BASE(disp_dll, env);
handler_desc = AXIS2_HANDLER_GET_HANDLER_DESC(handler, env);
- AXIS2_HANDLER_DESC_ADD_PARAM(handler_desc, env, impl_info_param);
+ axis2_handler_desc_add_param(handler_desc, env, impl_info_param);
/*disptachClas.getHandlerDesc().setParent(axisConfiguration); */
AXIS2_PHASE_ADD_HANDLER_AT(disp_phase, env, count, handler);
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Wed Mar 7 05:07:40 2007
@@ -1335,12 +1335,12 @@
AXIS2_HANDLER_CREATE_FUNC handler_create_func = NULL;
handlermd = axis2_flow_get_handler(flow, env, j);
- handler_name = AXIS2_HANDLER_DESC_GET_NAME(handlermd, env);
+ handler_name = axis2_handler_desc_get_name(handlermd, env);
handler_create_func = axis2_hash_get(handler_create_func_map,
axis2_string_get_buffer(handler_name, env), AXIS2_HASH_KEY_STRING);
handler = handler_create_func(env, handler_name);
AXIS2_HANDLER_INIT(handler, env, handlermd);
- AXIS2_HANDLER_DESC_SET_HANDLER(handlermd, env, handler);
+ axis2_handler_desc_set_handler(handlermd, env, handler);
}
return AXIS2_SUCCESS;
}
@@ -1369,7 +1369,7 @@
axis2_param_t *impl_info_param = NULL;
handlermd = axis2_flow_get_handler(flow, env, j);
- handler_class_name = AXIS2_HANDLER_DESC_GET_CLASS_NAME(handlermd, env);
+ handler_class_name = axis2_handler_desc_get_class_name(handlermd, env);
dll_desc = axis2_dll_desc_create(env);
handler_dll_name =
AXIS2_DLL_DESC_CREATE_PLATFORM_SPECIFIC_DLL_NAME(dll_desc, env,
@@ -1382,7 +1382,7 @@
handler = (axis2_handler_t *) axis2_class_loader_create_dll(env,
impl_info_param);
AXIS2_HANDLER_INIT(handler, env, handlermd);
- AXIS2_HANDLER_DESC_SET_HANDLER(handlermd, env, handler);
+ axis2_handler_desc_set_handler(handlermd, env, handler);
}
return AXIS2_SUCCESS;
}*/
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Wed Mar 7 05:07:40 2007
@@ -432,7 +432,7 @@
if (!name_attrib)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
AXIS2_FAILURE);
return NULL;
@@ -444,13 +444,13 @@
value = AXIOM_ATTRIBUTE_GET_VALUE(name_attrib, env);
handler_name = axis2_string_create(env, value);
- status = AXIS2_HANDLER_DESC_SET_NAME(handler_desc, env, handler_name);
+ status = axis2_handler_desc_set_name(handler_desc, env, handler_name);
if (handler_name)
axis2_string_free(handler_name, env);
if (AXIS2_SUCCESS != status)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
return NULL;
}
}
@@ -464,7 +464,7 @@
if (NULL == class_attrib)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
AXIS2_FAILURE);
return NULL;
@@ -472,10 +472,10 @@
else
{
attrib_value = AXIOM_ATTRIBUTE_GET_VALUE(class_attrib, env);
- status = AXIS2_HANDLER_DESC_SET_CLASS_NAME(handler_desc, env, attrib_value);
+ status = axis2_handler_desc_set_class_name(handler_desc, env, attrib_value);
/*if(AXIS2_FAILURE == status)
{
- AXIS2_HANDLER_DESC_FREE(handler, env);
+ axis2_handler_desc_free(handler, env);
return NULL;
}*/
}
@@ -490,7 +490,7 @@
if (NULL == order_element || NULL == order_node)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE,
AXIS2_FAILURE);
return NULL;
@@ -505,7 +505,7 @@
order_itr = AXIOM_ELEMENT_GET_ALL_ATTRIBUTES(order_element, env);
if (!order_itr)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
return NULL;
}
@@ -529,33 +529,33 @@
{
struct axis2_phase_rule *phase_rule = NULL;
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
status = AXIS2_PHASE_RULE_SET_AFTER(phase_rule, env, value);
if (AXIS2_SUCCESS != status)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
return NULL;
}
}
if (0 == AXIS2_STRCMP(AXIS2_BEFORE, name))
{
struct axis2_phase_rule *phase_rule = NULL;
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
status = AXIS2_PHASE_RULE_SET_BEFORE(phase_rule, env, value);
if (AXIS2_SUCCESS != status)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
return NULL;
}
}
if (0 == AXIS2_STRCMP(AXIS2_PHASE, name))
{
struct axis2_phase_rule *phase_rule = NULL;
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
status = AXIS2_PHASE_RULE_SET_NAME(phase_rule, env, value);
if (AXIS2_SUCCESS != status)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
return NULL;
}
}
@@ -568,12 +568,12 @@
if (0 == AXIS2_STRCMP(bool_val, "true"))
{
struct axis2_phase_rule *phase_rule = NULL;
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
status = AXIS2_PHASE_RULE_SET_FIRST(phase_rule, env,
AXIS2_TRUE);
if (AXIS2_SUCCESS != status)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
AXIS2_FREE(env->allocator, bool_val);
return NULL;
}
@@ -581,12 +581,12 @@
else if (0 == AXIS2_STRCMP(bool_val, "false"))
{
struct axis2_phase_rule *phase_rule = NULL;
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
status = AXIS2_PHASE_RULE_SET_FIRST(phase_rule, env,
AXIS2_FALSE);
if (AXIS2_SUCCESS != status)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
AXIS2_FREE(env->allocator, bool_val);
return NULL;
}
@@ -604,15 +604,15 @@
axis2_handler_desc_get_param_container(handler_desc, env), parent);
if (AXIS2_SUCCESS != status)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
return NULL;
}
}
- status = AXIS2_HANDLER_DESC_SET_PARENT(handler_desc, env, parent);
+ status = axis2_handler_desc_set_parent(handler_desc, env, parent);
if (AXIS2_SUCCESS != status)
{
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/description/flow.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/flow.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow.c Wed Mar 7 05:07:40 2007
@@ -68,7 +68,7 @@
handler_desc =
(axis2_handler_desc_t *) axis2_array_list_get(flow->list, env, i);
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
}
axis2_array_list_free(flow->list, env);
}
Modified: webservices/axis2/trunk/c/modules/core/description/handler_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/handler_desc.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Wed Mar 7 05:07:40 2007
@@ -37,8 +37,7 @@
};
AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
-axis2_handler_desc_create(
- const axis2_env_t *env,
+axis2_handler_desc_create(const axis2_env_t *env,
axis2_string_t *name)
{
axis2_handler_desc_t *handler_desc = NULL;
@@ -86,17 +85,14 @@
}
AXIS2_EXTERN const axis2_string_t *AXIS2_CALL
-axis2_handler_desc_get_name(
- const axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_get_name(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return handler_desc->name;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_handler_desc_set_name(
- axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_set_name(axis2_handler_desc_t *handler_desc,
const axis2_env_t *env,
axis2_string_t *name)
{
@@ -113,21 +109,17 @@
}
return AXIS2_SUCCESS;
-
}
AXIS2_EXTERN axis2_phase_rule_t *AXIS2_CALL
-axis2_handler_desc_get_rules(
- const axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_get_rules(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return handler_desc->rules;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_handler_desc_set_rules(
- axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_set_rules(axis2_handler_desc_t *handler_desc,
const axis2_env_t *env,
axis2_phase_rule_t *phase_rule)
{
@@ -136,60 +128,57 @@
if (handler_desc->rules)
{
AXIS2_PHASE_RULE_FREE(handler_desc->rules, env);
- handler_desc->rules = NULL;
}
if (phase_rule)
{
handler_desc->rules = AXIS2_PHASE_RULE_CLONE(phase_rule, env);
if (!(handler_desc->rules))
+ {
return AXIS2_FAILURE;
+ }
}
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_param_t *AXIS2_CALL
-axis2_handler_desc_get_param(
- const axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_get_param(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env,
const axis2_char_t *name)
{
- AXIS2_ENV_CHECK(env, NULL);
return AXIS2_PARAM_CONTAINER_GET_PARAM(handler_desc->param_container, env, name);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_handler_desc_add_param(
- axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_add_param(axis2_handler_desc_t *handler_desc,
const axis2_env_t *env,
axis2_param_t *param)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc->parent, env,
- AXIS2_PARAM_GET_NAME(param, env)))
+ AXIS2_PARAM_GET_NAME(param, env)))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(handler_desc->param_container, env, param);
+ return AXIS2_PARAM_CONTAINER_ADD_PARAM(handler_desc->param_container,
+ env, param);
}
AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
-axis2_handler_desc_get_all_params(
- const axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_get_all_params(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(handler_desc->param_container, env);
+ return AXIS2_PARAM_CONTAINER_GET_PARAMS(handler_desc->param_container,
+ env);
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_handler_desc_is_param_locked(
- const axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_is_param_locked(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env,
const axis2_char_t *param_name)
{
@@ -197,25 +186,24 @@
/* see if it is locked in parent */
if (AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc->parent, env,
- param_name))
+ param_name))
+ {
return AXIS2_TRUE;
+ }
return AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc->param_container,
- env, param_name);
+ env, param_name);
}
AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
-axis2_handler_desc_get_handler(
- const axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_get_handler(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return handler_desc->handler;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_handler_desc_set_handler(
- axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_set_handler(axis2_handler_desc_t *handler_desc,
const axis2_env_t *env,
axis2_handler_t *handler)
{
@@ -226,28 +214,24 @@
if (handler_desc->handler && (handler_desc->handler != handler))
{
AXIS2_HANDLER_FREE(handler_desc->handler, env);
- handler_desc->handler = NULL;
}
if (handler)
handler_desc->handler = handler; /* Shallow copy, but free method
- should free this */
+ should free this */
return AXIS2_SUCCESS;
}
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
-axis2_handler_desc_get_class_name(
- const axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_get_class_name(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return handler_desc->class_name;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_handler_desc_set_class_name(
- axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_set_class_name(axis2_handler_desc_t *handler_desc,
const axis2_env_t *env,
const axis2_char_t *class_name)
{
@@ -256,7 +240,6 @@
if (handler_desc->class_name)
{
AXIS2_FREE(env->allocator, handler_desc->class_name);
- handler_desc->class_name = NULL;
}
if (class_name)
@@ -273,30 +256,25 @@
}
AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
-axis2_handler_desc_get_parent(
- const axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_get_parent(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return handler_desc->parent;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_handler_desc_set_parent(
- axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_set_parent(axis2_handler_desc_t *handler_desc,
const axis2_env_t *env,
axis2_param_container_t *parent)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
handler_desc->parent = parent; /* shallow copy, because
- the parent lives
- somewhere else*/
+ the parent lives somewhere else*/
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_handler_desc_free(
- axis2_handler_desc_t *handler_desc,
+axis2_handler_desc_free(axis2_handler_desc_t *handler_desc,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -304,41 +282,34 @@
if (handler_desc->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(handler_desc-> param_container, env);
- handler_desc->param_container = NULL;
}
if (handler_desc->name)
{
axis2_string_free(handler_desc->name, env);
- handler_desc->name = NULL;
}
if (handler_desc->rules)
{
AXIS2_PHASE_RULE_FREE(handler_desc->rules, env);
- handler_desc->rules = NULL;
}
if (handler_desc->handler)
{
AXIS2_HANDLER_FREE(handler_desc->handler, env);
- handler_desc->handler = NULL;
}
if (handler_desc->class_name)
{
AXIS2_FREE(env->allocator, handler_desc->class_name);
- handler_desc->class_name = NULL;
}
if (handler_desc)
{
AXIS2_FREE(env->allocator, handler_desc);
- handler_desc = NULL;
}
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
axis2_handler_desc_get_param_container(const axis2_handler_desc_t *handler_desc,
Modified: webservices/axis2/trunk/c/modules/core/engine/conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/conf.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Wed Mar 7 05:07:40 2007
@@ -916,7 +916,7 @@
handler_desc = (axis2_handler_desc_t *)
axis2_array_list_get(config_impl->handlers, env, i);
if (handler_desc)
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
handler_desc = NULL;
Modified: webservices/axis2/trunk/c/modules/core/engine/handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/handler.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/handler.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/handler.c Wed Mar 7 05:07:40 2007
@@ -144,7 +144,7 @@
if (!(AXIS2_INTF_TO_IMPL(handler)->handler_desc))
return NULL;
- return AXIS2_HANDLER_DESC_GET_NAME(AXIS2_INTF_TO_IMPL(handler)->handler_desc, env);
+ return axis2_handler_desc_get_name(AXIS2_INTF_TO_IMPL(handler)->handler_desc, env);
}
axis2_status_t AXIS2_CALL
@@ -168,7 +168,7 @@
if (!(AXIS2_INTF_TO_IMPL(handler)->handler_desc))
return NULL;
- return AXIS2_HANDLER_DESC_GET_PARAM(AXIS2_INTF_TO_IMPL(handler)->handler_desc, env, name);
+ return axis2_handler_desc_get_param(AXIS2_INTF_TO_IMPL(handler)->handler_desc, env, name);
}
axis2_status_t AXIS2_CALL
@@ -179,7 +179,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(handler)->handler_desc = handler_desc;
- AXIS2_HANDLER_DESC_SET_HANDLER(handler_desc, env, handler);
+ axis2_handler_desc_set_handler(handler_desc, env, handler);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/phase.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/phase.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/phase.c Wed Mar 7 05:07:40 2007
@@ -429,7 +429,7 @@
return AXIS2_FAILURE;
}
- rules = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ rules = axis2_handler_desc_get_rules(handler_desc, env);
if (!rules)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -547,7 +547,7 @@
}
else
{
- rules = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ rules = axis2_handler_desc_get_rules(handler_desc, env);
if (!rules)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -565,7 +565,7 @@
return AXIS2_FAILURE;
}
- handler = AXIS2_HANDLER_DESC_GET_HANDLER(handler_desc, env);
+ handler = axis2_handler_desc_get_handler(handler_desc, env);
if (!handler)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -580,7 +580,7 @@
}
else if (first)
{
- handler = AXIS2_HANDLER_DESC_GET_HANDLER(handler_desc, env);
+ handler = axis2_handler_desc_get_handler(handler_desc, env);
if (!handler)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -590,7 +590,7 @@
}
else if (last)
{
- handler = AXIS2_HANDLER_DESC_GET_HANDLER(handler_desc, env);
+ handler = axis2_handler_desc_get_handler(handler_desc, env);
if (!handler)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -600,7 +600,7 @@
}
else
{
- handler = AXIS2_HANDLER_DESC_GET_HANDLER(handler_desc, env);
+ handler = axis2_handler_desc_get_handler(handler_desc, env);
if (!handler)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -633,7 +633,7 @@
if (!handler_desc)
return AXIS2_TRUE;
- first_handler_name = axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env), env);
+ first_handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!first_handler_name)
return AXIS2_TRUE;
@@ -642,7 +642,7 @@
if (!handler_desc)
return AXIS2_TRUE;
- rules = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ rules = axis2_handler_desc_get_rules(handler_desc, env);
if (!rules)
return AXIS2_TRUE;
@@ -680,7 +680,7 @@
if (!handler_desc)
return AXIS2_TRUE;
- last_handler_name = axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env), env);
+ last_handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!last_handler_name)
return AXIS2_TRUE;
@@ -689,7 +689,7 @@
if (!handler_desc)
return AXIS2_TRUE;
- rules = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ rules = axis2_handler_desc_get_rules(handler_desc, env);
if (!rules)
return AXIS2_TRUE;
@@ -730,7 +730,7 @@
return AXIS2_FAILURE;
}
- rules = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ rules = axis2_handler_desc_get_rules(handler_desc, env);
if (!rules)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -753,7 +753,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env), env);
+ handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -781,7 +781,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env), env);
+ handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -824,7 +824,7 @@
return AXIS2_FAILURE;
}
- rules = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ rules = axis2_handler_desc_get_rules(handler_desc, env);
if (!rules)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -847,7 +847,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env), env);
+ handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -874,7 +874,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env), env);
+ handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -930,7 +930,7 @@
return AXIS2_FAILURE;
}
- rules = AXIS2_HANDLER_DESC_GET_RULES(handler_desc, env);
+ rules = axis2_handler_desc_get_rules(handler_desc, env);
if (!rules)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM, AXIS2_FAILURE);
@@ -960,7 +960,7 @@
return AXIS2_FAILURE;
}
- before_handler_name = axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env), env);
+ before_handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -977,7 +977,7 @@
return AXIS2_FAILURE;
}
- after_handler_name = axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env), env);
+ after_handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -1021,7 +1021,7 @@
return AXIS2_FAILURE;
}
- handler_name = axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler_desc, env), env);
+ handler_name = axis2_string_get_buffer(axis2_handler_desc_get_name(handler_desc, env), env);
if (!handler_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HANDLER_STATE, AXIS2_FAILURE);
@@ -1075,7 +1075,7 @@
phase_impl = AXIS2_INTF_TO_IMPL(phase);
- handler = AXIS2_HANDLER_DESC_GET_HANDLER(handler_desc, env);
+ handler = axis2_handler_desc_get_handler(handler_desc, env);
if (!handler)
{
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c Wed Mar 7 05:07:40 2007
@@ -188,7 +188,7 @@
AXIS2_PARAM_CHECK(env->error, handler, AXIS2_FAILURE);
phase_name = AXIS2_PHASE_RULE_GET_NAME(
- AXIS2_HANDLER_DESC_GET_RULES(handler, env), env);
+ axis2_handler_desc_get_rules(handler, env), env);
if (AXIS2_TRUE == axis2_phase_holder_is_phase_exist(phase_holder, env,
phase_name))
{
@@ -197,7 +197,7 @@
phase = axis2_phase_holder_get_phase(phase_holder, env, phase_name);
status = AXIS2_PHASE_ADD_HANDLER_DESC(phase, env, handler);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Add handler %s to phase %s",
- axis2_string_get_buffer(AXIS2_HANDLER_DESC_GET_NAME(handler, env), env),
+ axis2_string_get_buffer(axis2_handler_desc_get_name(handler, env), env),
phase_name);
}
else
@@ -270,7 +270,7 @@
if (AXIS2_FAILURE == status)
return status;
- status = AXIS2_HANDLER_DESC_SET_HANDLER(handler_desc, env, handler);
+ status = axis2_handler_desc_set_handler(handler_desc, env, handler);
if (AXIS2_FAILURE == status)
return status;
Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?view=diff&rev=515557&r1=515556&r2=515557
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Wed Mar 7 05:07:40 2007
@@ -420,7 +420,7 @@
axis2_phase_rule_t *phase_rule = NULL;
metadata = axis2_flow_get_handler(flow, env, j);
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
+ phase_rule = axis2_handler_desc_get_rules(metadata, env);
phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
if (NULL == phase_name)
{
@@ -527,7 +527,7 @@
axis2_phase_rule_t *phase_rule = NULL;
metadata = axis2_flow_get_handler(flow, env, j);
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
+ phase_rule = axis2_handler_desc_get_rules(metadata, env);
if (phase_rule)
{
phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
@@ -580,7 +580,7 @@
handler_desc = axis2_array_list_get(all_handlers,
env, i);
- AXIS2_HANDLER_DESC_FREE(handler_desc, env);
+ axis2_handler_desc_free(handler_desc, env);
}
axis2_array_list_free(all_handlers, env);
all_handlers = NULL;
@@ -780,7 +780,7 @@
axis2_phase_rule_t *rule = NULL;
metadata = axis2_flow_get_handler(flow, env, j);
- rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
+ rule = axis2_handler_desc_get_rules(metadata, env);
if (rule)
{
status = AXIS2_PHASE_RULE_SET_NAME(rule, env,
@@ -798,7 +798,7 @@
for (i = 0; i < size; i++)
{
handler_d = axis2_array_list_get(handlers, env, i);
- AXIS2_HANDLER_DESC_FREE(handler_d, env);
+ axis2_handler_desc_free(handler_d, env);
}
axis2_array_list_free(handlers, env);
}
@@ -817,7 +817,7 @@
for (i = 0; i < size; i++)
{
handler_d = axis2_array_list_get(handlers, env, i);
- AXIS2_HANDLER_DESC_FREE(handler_d, env);
+ axis2_handler_desc_free(handler_d, env);
}
axis2_array_list_free(handlers, env);
}
@@ -837,7 +837,7 @@
for (i = 0; i < size; i++)
{
handler_d = axis2_array_list_get(handlers, env, i);
- AXIS2_HANDLER_DESC_FREE(handler_d, env);
+ axis2_handler_desc_free(handler_d, env);
}
axis2_array_list_free(handlers, env);
}
@@ -918,7 +918,7 @@
metadata = axis2_flow_get_handler(flow, env, j);
- rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
+ rule = axis2_handler_desc_get_rules(metadata, env);
if (rule)
{
status = AXIS2_PHASE_RULE_SET_NAME(rule, env,
@@ -936,7 +936,7 @@
for (i = 0; i < size; i++)
{
handler_d = axis2_array_list_get(handlers, env, i);
- AXIS2_HANDLER_DESC_FREE(handler_d, env);
+ axis2_handler_desc_free(handler_d, env);
}
axis2_array_list_free(handlers, env);
}
@@ -956,7 +956,7 @@
for (i = 0; i < size; i++)
{
handler_d = axis2_array_list_get(handlers, env, i);
- AXIS2_HANDLER_DESC_FREE(handler_d, env);
+ axis2_handler_desc_free(handler_d, env);
}
axis2_array_list_free(handlers, env);
}
@@ -976,7 +976,7 @@
for (i = 0; i < size; i++)
{
handler_d = axis2_array_list_get(handlers, env, i);
- AXIS2_HANDLER_DESC_FREE(handler_d, env);
+ axis2_handler_desc_free(handler_d, env);
}
axis2_array_list_free(handlers, env);
}
@@ -1227,7 +1227,7 @@
axis2_phase_rule_t *phase_rule = NULL;
metadata = axis2_flow_get_handler(flow, env, j);
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
+ phase_rule = axis2_handler_desc_get_rules(metadata, env);
if (phase_rule)
{
phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
@@ -1371,7 +1371,7 @@
axis2_phase_rule_t *phase_rule = NULL;
metadata = axis2_flow_get_handler(flow, env, j);
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
+ phase_rule = axis2_handler_desc_get_rules(metadata, env);
if (phase_rule)
{
phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
@@ -1580,7 +1580,7 @@
axis2_status_t status = AXIS2_FAILURE;
metadata = axis2_flow_get_handler(flow, env, j);
- phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
+ phase_rule = axis2_handler_desc_get_rules(metadata, env);
phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
if ((0 != AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name)) &&
(0 != AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name)) &&
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org