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 pi...@apache.org on 2007/03/07 12:52:32 UTC
svn commit: r515542 - in /webservices/axis2/trunk/c:
include/axis2_flow_container.h modules/core/description/flow_container.c
modules/core/description/module_desc.c modules/core/description/svc.c
Author: pini
Date: Wed Mar 7 03:52:31 2007
New Revision: 515542
URL: http://svn.apache.org/viewvc?view=rev&rev=515542
Log:
Macros dropped, fixed documentation.
Modified:
webservices/axis2/trunk/c/include/axis2_flow_container.h
webservices/axis2/trunk/c/modules/core/description/flow_container.c
webservices/axis2/trunk/c/modules/core/description/module_desc.c
webservices/axis2/trunk/c/modules/core/description/svc.c
Modified: webservices/axis2/trunk/c/include/axis2_flow_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_flow_container.h?view=diff&rev=515542&r1=515541&r2=515542
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_flow_container.h (original)
+++ webservices/axis2/trunk/c/include/axis2_flow_container.h Wed Mar 7 03:52:31 2007
@@ -160,42 +160,6 @@
axis2_flow_container_create (const axis2_env_t *env);
-/** Frees flow container. */
-#define AXIS2_FLOW_CONTAINER_FREE(flow_container, env) \
- axis2_flow_container_free (flow_container, env)
-
-/** Gets in flow. */
-#define AXIS2_FLOW_CONTAINER_GET_IN_FLOW(flow_container, env) \
- axis2_flow_container_get_in_flow (flow_container, env)
-
-/** Sets in flow. */
-#define AXIS2_FLOW_CONTAINER_SET_IN_FLOW(flow_container, env, in_flow) \
- axis2_flow_container_set_in_flow (flow_container, env, in_flow)
-
-/** Gets out flow. */
-#define AXIS2_FLOW_CONTAINER_GET_OUT_FLOW(flow_container, env) \
- axis2_flow_container_get_out_flow (flow_container, env)
-
-/** Sets out flow. */
-#define AXIS2_FLOW_CONTAINER_SET_OUT_FLOW(flow_container, env, out_flow) \
- axis2_flow_container_set_out_flow (flow_container, env, out_flow)
-
-/** Gets fault in flow. */
-#define AXIS2_FLOW_CONTAINER_GET_FAULT_IN_FLOW(flow_container, env) \
- axis2_flow_container_get_fault_in_flow (flow_container, env)
-
-/** Sets fault in flow. */
-#define AXIS2_FLOW_CONTAINER_SET_FAULT_IN_FLOW(flow_container, env, fault_in_flow) \
- axis2_flow_container_set_fault_in_flow (flow_container, env, fault_in_flow)
-
-/** Gets fault out flow. */
-#define AXIS2_FLOW_CONTAINER_GET_FAULT_OUT_FLOW(flow_container, env) \
- axis2_flow_container_get_fault_out_flow (flow_container, env)
-
-/** Sets fault out flow. */
-#define AXIS2_FLOW_CONTAINER_SET_FAULT_OUT_FLOW(flow_container, env, fault_out_flow) \
- axis2_flow_container_set_fault_out_flow (flow_container, env, fault_out_flow)
-
/** @} */
#ifdef __cplusplus
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=515542&r1=515541&r2=515542
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow_container.c Wed Mar 7 03:52:31 2007
@@ -24,19 +24,17 @@
axis2_flow_t *out;
axis2_flow_t *in_fault;
axis2_flow_t *out_fault;
-
};
AXIS2_EXTERN axis2_flow_container_t *AXIS2_CALL
-axis2_flow_container_create(
- const axis2_env_t *env)
+axis2_flow_container_create(const axis2_env_t *env)
{
axis2_flow_container_t *flow_container = NULL;
AXIS2_ENV_CHECK(env, NULL);
flow_container = (axis2_flow_container_t *) AXIS2_MALLOC(env->
- allocator, sizeof(axis2_flow_container_t));
+ allocator, sizeof(axis2_flow_container_t));
if (NULL == flow_container)
@@ -54,8 +52,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_flow_container_free(
- axis2_flow_container_t *flow_container,
+axis2_flow_container_free(axis2_flow_container_t *flow_container,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -63,48 +60,40 @@
if (flow_container->in)
{
axis2_flow_free(flow_container->in, env);
- flow_container->in = NULL;
}
if (flow_container->out)
{
axis2_flow_free(flow_container->out, env);
- flow_container->out = NULL;
}
if (flow_container->in_fault)
{
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);
- flow_container->out_fault = NULL;
}
if (flow_container)
{
AXIS2_FREE(env->allocator, flow_container);
- flow_container = NULL;
}
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-axis2_flow_container_get_in_flow(
- const axis2_flow_container_t *flow_container,
+axis2_flow_container_get_in_flow(const axis2_flow_container_t *flow_container,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return flow_container->in;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_flow_container_set_in_flow(
- axis2_flow_container_t *flow_container,
+axis2_flow_container_set_in_flow(axis2_flow_container_t *flow_container,
const axis2_env_t *env,
axis2_flow_t *in_flow)
{
@@ -113,24 +102,20 @@
if (flow_container->in)
{
axis2_flow_free(flow_container->in, env);
- flow_container->in = NULL;
}
flow_container->in = in_flow;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-axis2_flow_container_get_out_flow(
- const axis2_flow_container_t *flow_container,
+axis2_flow_container_get_out_flow(const axis2_flow_container_t *flow_container,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return flow_container->out;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_flow_container_set_out_flow(
- axis2_flow_container_t *flow_container,
+axis2_flow_container_set_out_flow(axis2_flow_container_t *flow_container,
const axis2_env_t *env,
axis2_flow_t *out_flow)
{
@@ -139,24 +124,20 @@
if (flow_container->out)
{
axis2_flow_free(flow_container->out, env);
- flow_container->out = NULL;
}
flow_container->out = out_flow;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-axis2_flow_container_get_fault_in_flow(
- const axis2_flow_container_t *flow_container,
+axis2_flow_container_get_fault_in_flow(const axis2_flow_container_t *flow_container,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return flow_container->in_fault;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_flow_container_set_fault_in_flow(
- axis2_flow_container_t *flow_container,
+axis2_flow_container_set_fault_in_flow(axis2_flow_container_t *flow_container,
const axis2_env_t *env,
axis2_flow_t *falut_in_flow)
{
@@ -164,24 +145,20 @@
if (flow_container->in_fault)
{
axis2_flow_free(flow_container->in_fault, env);
- flow_container->in_fault = NULL;
}
flow_container->in_fault = falut_in_flow;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
-axis2_flow_container_get_fault_out_flow(
- const axis2_flow_container_t *flow_container,
+axis2_flow_container_get_fault_out_flow(const axis2_flow_container_t *flow_container,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return flow_container->out_fault;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_flow_container_set_fault_out_flow(
- axis2_flow_container_t *flow_container,
+axis2_flow_container_set_fault_out_flow(axis2_flow_container_t *flow_container,
const axis2_env_t *env,
axis2_flow_t *fault_out_flow)
{
@@ -190,7 +167,6 @@
if (flow_container->out_fault)
{
axis2_flow_free(flow_container->out_fault, env);
- flow_container->out_fault = NULL;
}
flow_container->out_fault = fault_out_flow;
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/description/module_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/module_desc.c?view=diff&rev=515542&r1=515541&r2=515542
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Wed Mar 7 03:52:31 2007
@@ -133,7 +133,7 @@
if (module_desc->flow_container)
{
- AXIS2_FLOW_CONTAINER_FREE(module_desc->flow_container, env);
+ axis2_flow_container_free(module_desc->flow_container, env);
module_desc->flow_container = NULL;
}
@@ -193,7 +193,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_FLOW_CONTAINER_GET_IN_FLOW(module_desc->flow_container, env);
+ return axis2_flow_container_get_in_flow(module_desc->flow_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -205,7 +205,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, in_flow, AXIS2_FAILURE);
- return AXIS2_FLOW_CONTAINER_SET_IN_FLOW(module_desc->flow_container, env,
+ return axis2_flow_container_set_in_flow(module_desc->flow_container, env,
in_flow);
}
@@ -216,7 +216,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_FLOW_CONTAINER_GET_OUT_FLOW(module_desc->flow_container, env);
+ return axis2_flow_container_get_out_flow(module_desc->flow_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -228,7 +228,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, out_flow, AXIS2_FAILURE);
- return AXIS2_FLOW_CONTAINER_SET_OUT_FLOW(module_desc->flow_container, env,
+ return axis2_flow_container_set_out_flow(module_desc->flow_container, env,
out_flow);
}
@@ -239,7 +239,7 @@
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_FLOW_CONTAINER_GET_FAULT_IN_FLOW(module_desc->flow_container, env);
+ return axis2_flow_container_get_fault_in_flow(module_desc->flow_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -251,7 +251,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, falut_in_flow, AXIS2_FAILURE);
- return AXIS2_FLOW_CONTAINER_SET_FAULT_IN_FLOW(module_desc->flow_container,
+ return axis2_flow_container_set_fault_in_flow(module_desc->flow_container,
env, falut_in_flow);
}
@@ -261,7 +261,7 @@
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return AXIS2_FLOW_CONTAINER_GET_FAULT_OUT_FLOW(module_desc->flow_container, env);
+ return axis2_flow_container_get_fault_out_flow(module_desc->flow_container, env);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -273,7 +273,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, fault_out_flow, AXIS2_FAILURE);
- return AXIS2_FLOW_CONTAINER_SET_FAULT_OUT_FLOW(module_desc->flow_container,
+ return axis2_flow_container_set_fault_out_flow(module_desc->flow_container,
env, fault_out_flow);
}
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?view=diff&rev=515542&r1=515541&r2=515542
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Wed Mar 7 03:52:31 2007
@@ -259,7 +259,7 @@
if (svc->flow_container)
{
- AXIS2_FLOW_CONTAINER_FREE(svc->flow_container, env);
+ axis2_flow_container_free(svc->flow_container, env);
svc->flow_container = NULL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org