You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by du...@apache.org on 2007/03/07 10:38:11 UTC
svn commit: r515507 - in /webservices/axis2/trunk/c: include/
modules/core/deployment/ modules/core/description/
modules/core/phaseresolver/
Author: dushshantha
Date: Wed Mar 7 01:38:10 2007
New Revision: 515507
URL: http://svn.apache.org/viewvc?view=rev&rev=515507
Log:
removed macros and corrected indentation
Modified:
webservices/axis2/trunk/c/include/axis2_flow.h
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/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/description/flow.c
webservices/axis2/trunk/c/modules/core/description/flow_container.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
Modified: webservices/axis2/trunk/c/include/axis2_flow.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_flow.h?view=diff&rev=515507&r1=515506&r2=515507
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_flow.h (original)
+++ webservices/axis2/trunk/c/include/axis2_flow.h Wed Mar 7 01:38:10 2007
@@ -26,10 +26,6 @@
* @{
*/
-/**
- * @file axis2_flow.h
- */
-
#include <axis2_const.h>
#include <axis2_error.h>
#include <axis2_defines.h>
@@ -48,6 +44,13 @@
/** Type name for struct axis2_flow */
typedef struct axis2_flow axis2_flow_t;
+ /**
+ * Creates flow struct.
+ * @param env pointer to environment struct
+ * @return pointer to newly created flow
+ */
+ AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
+ axis2_flow_create (const axis2_env_t *env);
/**
* Frees flow struct.
@@ -94,14 +97,6 @@
const axis2_env_t *env);
/**
- * Creates flow struct.
- * @param env pointer to environment struct
- * @return pointer to newly created flow
- */
- AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
- axis2_flow_create (const axis2_env_t *env);
-
- /**
* Frees flow passed as void pointer. This method would cast the void
* pointer to appropriate type and then call free method.
* @param flow pointer to flow
@@ -111,22 +106,6 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_flow_free_void_arg (void *flow,
const axis2_env_t *env);
-
-
-/** Frees flow. */
-#define AXIS2_FLOW_FREE(flow, env) axis2_flow_free (flow, env)
-
-/** Adds handler. */
-#define AXIS2_FLOW_ADD_HANDLER(flow, env, handler) \
- axis2_flow_add_handler (flow, env, handler)
-
-/** Gets handler at given index. */
-#define AXIS2_FLOW_GET_HANDLER(flow, env, index) \
- axis2_flow_get_handler (flow, env, index)
-
-/** Gets handler count. */
-#define AXIS2_FLOW_GET_HANDLER_COUNT(flow, env) \
- axis2_flow_get_handler_count (flow, env)
/** @} */
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=515507&r1=515506&r2=515507
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Wed Mar 7 01:38:10 2007
@@ -1325,7 +1325,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, flow, AXIS2_FAILURE);
- count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
+ count = axis2_flow_get_handler_count(flow, env);
for (j = 0; j < count; j++)
{
@@ -1334,7 +1334,7 @@
const axis2_string_t *handler_name = NULL;
AXIS2_HANDLER_CREATE_FUNC handler_create_func = NULL;
- handlermd = AXIS2_FLOW_GET_HANDLER(flow, env, j);
+ handlermd = axis2_flow_get_handler(flow, env, j);
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);
@@ -1357,7 +1357,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, flow, AXIS2_FAILURE);
- count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
+ count = axis2_flow_get_handler_COUNT(flow, env);
for (j = 0; j < count; j++)
{
@@ -1368,7 +1368,7 @@
axis2_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
- handlermd = AXIS2_FLOW_GET_HANDLER(flow, env, j);
+ handlermd = axis2_flow_get_handler(flow, env, j);
handler_class_name = AXIS2_HANDLER_DESC_GET_CLASS_NAME(handlermd, env);
dll_desc = axis2_dll_desc_create(env);
handler_dll_name =
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=515507&r1=515506&r2=515507
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Wed Mar 7 01:38:10 2007
@@ -381,10 +381,10 @@
handler_desc = axis2_desc_builder_process_handler(desc_builder, env,
handler_node, parent);
- status = AXIS2_FLOW_ADD_HANDLER(flow, env, handler_desc);
+ status = axis2_flow_add_handler(flow, env, handler_desc);
if (AXIS2_SUCCESS != status)
{
- AXIS2_FLOW_FREE(flow, env);
+ axis2_flow_free(flow, env);
return NULL;
}
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=515507&r1=515506&r2=515507
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Wed Mar 7 01:38:10 2007
@@ -314,7 +314,7 @@
if (AXIS2_SUCCESS != status)
{
if (flow)
- AXIS2_FLOW_FREE(flow, env);
+ axis2_flow_free(flow, env);
return status;
}
}
@@ -336,7 +336,7 @@
status = AXIS2_MODULE_DESC_SET_OUT_FLOW(builder_impl->module_desc, env, flow);
if (AXIS2_SUCCESS != status)
{
- AXIS2_FLOW_FREE(flow, env);
+ axis2_flow_free(flow, env);
return status;
}
}
@@ -358,7 +358,7 @@
status = AXIS2_MODULE_DESC_SET_FAULT_IN_FLOW(builder_impl->module_desc, env, flow);
if (AXIS2_SUCCESS != status)
{
- AXIS2_FLOW_FREE(flow, env);
+ axis2_flow_free(flow, env);
return status;
}
}
@@ -381,7 +381,7 @@
env, flow);
if (AXIS2_SUCCESS != status)
{
- AXIS2_FLOW_FREE(flow, env);
+ axis2_flow_free(flow, env);
return status;
}
}
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=515507&r1=515506&r2=515507
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow.c Wed Mar 7 01:38:10 2007
@@ -23,16 +23,15 @@
};
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-axis2_flow_create(
- const axis2_env_t *env)
+axis2_flow_create(const axis2_env_t *env)
{
axis2_flow_t *flow = NULL;
AXIS2_ENV_CHECK(env, NULL);
flow = (axis2_flow_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_flow_t));
+ sizeof(axis2_flow_t));
- if (NULL == flow)
+ if (!flow)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -41,7 +40,7 @@
flow->list = NULL;
flow->list = axis2_array_list_create(env, 20);
- if (NULL == flow->list)
+ if (!(flow->list))
{
axis2_flow_free(flow, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -52,8 +51,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_flow_free(
- axis2_flow_t *flow,
+axis2_flow_free(axis2_flow_t *flow,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -68,26 +66,23 @@
{
axis2_handler_desc_t *handler_desc = NULL;
- handler_desc = (axis2_handler_desc_t *) axis2_array_list_get(
- flow->list, env, i);
+ handler_desc =
+ (axis2_handler_desc_t *) axis2_array_list_get(flow->list, env, i);
AXIS2_HANDLER_DESC_FREE(handler_desc, env);
}
axis2_array_list_free(flow->list, env);
- flow->list = NULL;
}
if (flow)
{
AXIS2_FREE(env->allocator, flow);
- flow = NULL;
}
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_flow_free_void_arg(
- void *flow,
+axis2_flow_free_void_arg(void *flow,
const axis2_env_t *env)
{
axis2_flow_t *flow_l = NULL;
@@ -98,8 +93,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_flow_add_handler(
- axis2_flow_t *flow,
+axis2_flow_add_handler(axis2_flow_t *flow,
const axis2_env_t *env,
axis2_handler_desc_t *handler)
{
@@ -109,7 +103,7 @@
if (!flow->list)
{
flow->list = axis2_array_list_create(env, 0);
- if (NULL == flow->list)
+ if (!flow->list)
{
axis2_flow_free(flow, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -120,23 +114,17 @@
}
AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
-axis2_flow_get_handler(
- const axis2_flow_t *flow,
+axis2_flow_get_handler(const axis2_flow_t *flow,
const axis2_env_t *env,
const int index)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return axis2_array_list_get(flow->list, env, index);
}
AXIS2_EXTERN int AXIS2_CALL
-axis2_flow_get_handler_count(
- const axis2_flow_t *flow,
+axis2_flow_get_handler_count(const axis2_flow_t *flow,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
return axis2_array_list_size(flow->list, env);
}
Modified: webservices/axis2/trunk/c/modules/core/description/flow_container.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/flow_container.c?view=diff&rev=515507&r1=515506&r2=515507
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow_container.c Wed Mar 7 01:38:10 2007
@@ -62,25 +62,25 @@
if (flow_container->in)
{
- AXIS2_FLOW_FREE(flow_container->in, env);
+ axis2_flow_free(flow_container->in, env);
flow_container->in = NULL;
}
if (flow_container->out)
{
- AXIS2_FLOW_FREE(flow_container->out, env);
+ axis2_flow_free(flow_container->out, env);
flow_container->out = NULL;
}
if (flow_container->in_fault)
{
- AXIS2_FLOW_FREE(flow_container->in_fault, env);
+ axis2_flow_free(flow_container->in_fault, env);
flow_container->in_fault = NULL;
}
if (flow_container->out_fault)
{
- AXIS2_FLOW_FREE(flow_container->out_fault, env);
+ axis2_flow_free(flow_container->out_fault, env);
flow_container->out_fault = NULL;
}
@@ -112,7 +112,7 @@
if (flow_container->in)
{
- AXIS2_FLOW_FREE(flow_container->in, env);
+ axis2_flow_free(flow_container->in, env);
flow_container->in = NULL;
}
flow_container->in = in_flow;
@@ -138,7 +138,7 @@
if (flow_container->out)
{
- AXIS2_FLOW_FREE(flow_container->out, env);
+ axis2_flow_free(flow_container->out, env);
flow_container->out = NULL;
}
flow_container->out = out_flow;
@@ -163,7 +163,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (flow_container->in_fault)
{
- AXIS2_FLOW_FREE(flow_container->in_fault, env);
+ axis2_flow_free(flow_container->in_fault, env);
flow_container->in_fault = NULL;
}
flow_container->in_fault = falut_in_flow;
@@ -189,7 +189,7 @@
AXIS2_PARAM_CHECK(env->error, fault_out_flow, AXIS2_FAILURE);
if (flow_container->out_fault)
{
- AXIS2_FLOW_FREE(flow_container->out_fault, env);
+ axis2_flow_free(flow_container->out_fault, env);
flow_container->out_fault = NULL;
}
flow_container->out_fault = fault_out_flow;
Modified: webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c?view=diff&rev=515507&r1=515506&r2=515507
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Wed Mar 7 01:38:10 2007
@@ -93,13 +93,13 @@
if (transport_in->in_flow)
{
- AXIS2_FLOW_FREE(transport_in->in_flow, env);
+ axis2_flow_free(transport_in->in_flow, env);
transport_in->in_flow = NULL;
}
if (transport_in->fault_in_flow)
{
- AXIS2_FLOW_FREE(transport_in->fault_in_flow, env);
+ axis2_flow_free(transport_in->fault_in_flow, env);
transport_in->fault_in_flow = NULL;
}
@@ -174,7 +174,7 @@
if (transport_in->in_flow)
{
- AXIS2_FLOW_FREE(transport_in->in_flow, env);
+ axis2_flow_free(transport_in->in_flow, env);
transport_in->in_flow = NULL;
}
transport_in->in_flow = in_flow;
@@ -200,7 +200,7 @@
if (transport_in->fault_in_flow)
{
- AXIS2_FLOW_FREE(transport_in->fault_in_flow, env);
+ axis2_flow_free(transport_in->fault_in_flow, env);
transport_in->fault_in_flow = NULL;
}
transport_in->fault_in_flow = fault_in_flow;
Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?view=diff&rev=515507&r1=515506&r2=515507
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Wed Mar 7 01:38:10 2007
@@ -87,13 +87,13 @@
if (transport_out->out_flow)
{
- AXIS2_FLOW_FREE(transport_out->out_flow, env);
+ axis2_flow_free(transport_out->out_flow, env);
transport_out->out_flow = NULL;
}
if (transport_out->fault_out_flow)
{
- AXIS2_FLOW_FREE(transport_out->fault_out_flow, env);
+ axis2_flow_free(transport_out->fault_out_flow, env);
transport_out->fault_out_flow = NULL;
}
@@ -167,7 +167,7 @@
if (transport_out->out_flow)
{
- AXIS2_FLOW_FREE(transport_out->out_flow, env);
+ axis2_flow_free(transport_out->out_flow, env);
transport_out->out_flow = NULL;
}
transport_out->out_flow = out_flow;
@@ -193,7 +193,7 @@
if (transport_out->fault_out_flow)
{
- AXIS2_FLOW_FREE(transport_out->fault_out_flow, env);
+ axis2_flow_free(transport_out->fault_out_flow, env);
transport_out->fault_out_flow = NULL;
}
transport_out->fault_out_flow = fault_out_flow;
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=515507&r1=515506&r2=515507
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Wed Mar 7 01:38:10 2007
@@ -406,7 +406,7 @@
{
int j = 0;
int count = 0;
- count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
+ count = axis2_flow_get_handler_count(flow, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
@@ -419,7 +419,7 @@
const axis2_char_t *phase_name = NULL;
axis2_phase_rule_t *phase_rule = NULL;
- metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
+ metadata = axis2_flow_get_handler(flow, env, j);
phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
phase_name = AXIS2_PHASE_RULE_GET_NAME(phase_rule, env);
if (NULL == phase_name)
@@ -509,7 +509,7 @@
{
int j = 0;
int count = 0;
- count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
+ count = axis2_flow_get_handler_count(flow, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -526,7 +526,7 @@
const axis2_char_t *phase_name = NULL;
axis2_phase_rule_t *phase_rule = NULL;
- metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
+ metadata = axis2_flow_get_handler(flow, env, j);
phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
if (phase_rule)
{
@@ -772,14 +772,14 @@
axis2_phase_holder_t *phase_holder = NULL;
int size = 0;
- size = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
+ size = axis2_flow_get_handler_count(flow, env);
handlers = axis2_array_list_create(env, 0);
for (j = 0; j < size; j++)
{
axis2_handler_desc_t *metadata = NULL;
axis2_phase_rule_t *rule = NULL;
- metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
+ metadata = axis2_flow_get_handler(flow, env, j);
rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
if (rule)
{
@@ -903,7 +903,7 @@
axis2_phase_holder_t *phase_holder = NULL;
int hndlr_count = 0;
int j = 0;
- hndlr_count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
+ hndlr_count = axis2_flow_get_handler_count(flow, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
return AXIS2_ERROR_GET_STATUS_CODE(env->error);
@@ -915,7 +915,7 @@
axis2_handler_desc_t *metadata = NULL;
axis2_phase_rule_t *rule = NULL;
- metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
+ metadata = axis2_flow_get_handler(flow, env, j);
rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
@@ -1219,14 +1219,14 @@
{
int handler_count = 0;
- handler_count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
+ handler_count = axis2_flow_get_handler_count(flow, env);
for (j = 0; j < handler_count; j++)
{
axis2_handler_desc_t *metadata = NULL;
const axis2_char_t *phase_name = NULL;
axis2_phase_rule_t *phase_rule = NULL;
- metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
+ metadata = axis2_flow_get_handler(flow, env, j);
phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
if (phase_rule)
{
@@ -1364,13 +1364,13 @@
if (flow)
{
int j = 0;
- for (j = 0; j < AXIS2_FLOW_GET_HANDLER_COUNT(flow, env); j++)
+ for (j = 0; j < axis2_flow_get_handler_count(flow, env); j++)
{
axis2_handler_desc_t *metadata = NULL;
const axis2_char_t *phase_name = NULL;
axis2_phase_rule_t *phase_rule = NULL;
- metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
+ metadata = axis2_flow_get_handler(flow, env, j);
phase_rule = AXIS2_HANDLER_DESC_GET_RULES(metadata, env);
if (phase_rule)
{
@@ -1571,7 +1571,7 @@
int j = 0;
int handler_count = 0;
- handler_count = AXIS2_FLOW_GET_HANDLER_COUNT(flow, env);
+ handler_count = axis2_flow_get_handler_count(flow, env);
for (j = 0; j < handler_count; j++)
{
axis2_handler_desc_t *metadata = NULL;
@@ -1579,7 +1579,7 @@
axis2_phase_rule_t *phase_rule = NULL;
axis2_status_t status = AXIS2_FAILURE;
- metadata = AXIS2_FLOW_GET_HANDLER(flow, env, j);
+ metadata = axis2_flow_get_handler(flow, env, j);
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)) &&
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org