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/12 07:27:53 UTC
svn commit: r517112 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/context/ modules/core/deployment/
modules/core/description/ modules/core/engine/ modules/core/phaseresolver/
Author: pini
Date: Sun Mar 11 23:27:51 2007
New Revision: 517112
URL: http://svn.apache.org/viewvc?view=rev&rev=517112
Log:
Dropped macros. Fixed indentation.
Modified:
webservices/axis2/trunk/c/include/axis2_transport_in_desc.h
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
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/conf_init.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
Modified: webservices/axis2/trunk/c/include/axis2_transport_in_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_in_desc.h?view=diff&rev=517112&r1=517111&r2=517112
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_in_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_in_desc.h Sun Mar 11 23:27:51 2007
@@ -285,70 +285,6 @@
axis2_transport_in_desc_free_void_arg(void *transport_in,
const axis2_env_t *env);
-/** Frees transport in description. */
-#define AXIS2_TRANSPORT_IN_DESC_FREE(transport_in_desc, env) \
- axis2_transport_in_desc_free (transport_in_desc, env)
-
-/** Gets transport enum. */
-#define AXIS2_TRANSPORT_IN_DESC_GET_ENUM(transport_in_desc, env) \
- axis2_transport_in_desc_get_enum (transport_in_desc, env)
-
-/** Sets transport enum. */
-#define AXIS2_TRANSPORT_IN_DESC_SET_ENUM(transport_in_desc, env, trans_enum) \
- axis2_transport_in_desc_set_enum (transport_in_desc, env, trans_enum)
-
-/** Gets in flow. */
-#define AXIS2_TRANSPORT_IN_DESC_GET_IN_FLOW(transport_in_desc, env) \
- axis2_transport_in_desc_get_in_flow (transport_in_desc, env)
-
-/** Sets in flow. */
-#define AXIS2_TRANSPORT_IN_DESC_SET_IN_FLOW(transport_in_desc, env, in_flow) \
- axis2_transport_in_desc_set_in_flow (transport_in_desc, env, in_flow)
-
-/** Gets fault flow. */
-#define AXIS2_TRANSPORT_IN_DESC_GET_FAULT_IN_FLOW(transport_in_desc, env) \
- axis2_transport_in_desc_get_fault_in_flow (transport_in_desc, env)
-
-/** Sets fault flow. */
-#define AXIS2_TRANSPORT_IN_DESC_SET_FAULT_IN_FLOW(transport_in_desc, env, fault_in_flow) \
- axis2_transport_in_desc_set_fault_in_flow (transport_in_desc, env, fault_in_flow)
-
-/** Gets transport receiver. */
-#define AXIS2_TRANSPORT_IN_DESC_GET_RECV(transport_in_desc, env) \
- axis2_transport_in_desc_get_recv (transport_in_desc, env)
-
-/** Sets transport receiver. */
-#define AXIS2_TRANSPORT_IN_DESC_SET_RECV(transport_in_desc, env, recv) \
- axis2_transport_in_desc_set_recv (transport_in_desc, env, recv)
-
-/** Gets in phase. */
-#define AXIS2_TRANSPORT_IN_DESC_GET_IN_PHASE(transport_in_desc, env) \
- axis2_transport_in_desc_get_in_phase (transport_in_desc, env)
-
-/** Sets in phase. */
-#define AXIS2_TRANSPORT_IN_DESC_SET_IN_PHASE(transport_in_desc, env, in_phase) \
- axis2_transport_in_desc_set_in_phase (transport_in_desc, env, in_phase)
-
-/** Gets fault phase. */
-#define AXIS2_TRANSPORT_IN_DESC_GET_FAULT_PHASE(transport_in_desc, env) \
- axis2_transport_in_desc_get_fault_phase (transport_in_desc, env)
-
-/** Sets fault phase. */
-#define AXIS2_TRANSPORT_IN_DESC_SET_FAULT_PHASE(transport_in_desc, env, fault_phase) \
- axis2_transport_in_desc_set_fault_phase (transport_in_desc, env, fault_phase)
-
-/** Adds parameter. */
-#define AXIS2_TRANSPORT_IN_DESC_ADD_PARAM(transport_in_desc, env, param) \
- axis2_transport_in_desc_add_param (transport_in_desc, env, param)
-
-/** Gets named parameter. */
-#define AXIS2_TRANSPORT_IN_DESC_GET_PARAM(transport_in_desc, env, param_name) \
- axis2_transport_in_desc_get_param (transport_in_desc, env, param_name)
-
-/** Checks if the named parameter is locked. */
-#define AXIS2_TRANSPORT_IN_DESC_IS_PARAM_LOCKED(transport_in_desc, env, param_name) \
- axis2_transport_in_desc_is_param_locked (transport_in_desc, env, param_name)
-
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c?view=diff&rev=517112&r1=517111&r2=517112
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c Sun Mar 11 23:27:51 2007
@@ -188,7 +188,7 @@
transport_in = AXIS2_CONF_GET_TRANSPORT_IN(conf, env, transport);
if (transport_in)
{
- listener = AXIS2_TRANSPORT_IN_DESC_GET_RECV(transport_in, env);
+ listener = axis2_transport_in_desc_get_recv(transport_in, env);
if (listener)
{
axis2_thread_t *worker_thread = NULL;
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=517112&r1=517111&r2=517112
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Sun Mar 11 23:27:51 2007
@@ -234,7 +234,7 @@
if (msg_ctx->transport_in_desc)
msg_ctx->transport_in_desc_enum =
- AXIS2_TRANSPORT_IN_DESC_GET_ENUM(transport_in_desc, env);
+ axis2_transport_in_desc_get_enum(transport_in_desc, env);
if (msg_ctx->transport_out_desc)
msg_ctx->transport_out_desc_enum =
AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(transport_out_desc, env);
@@ -946,7 +946,7 @@
{
msg_ctx->transport_in_desc = transport_in_desc;
msg_ctx->transport_in_desc_enum =
- AXIS2_TRANSPORT_IN_DESC_GET_ENUM(transport_in_desc, env);
+ axis2_transport_in_desc_get_enum(transport_in_desc, env);
}
return AXIS2_SUCCESS;
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=517112&r1=517111&r2=517112
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Sun Mar 11 23:27:51 2007
@@ -1054,9 +1054,9 @@
axis2_class_loader_init(env);
recv = (axis2_transport_receiver_t *)
axis2_class_loader_create_dll(env, impl_info_param);
- AXIS2_TRANSPORT_IN_DESC_ADD_PARAM(transport_in, env,
+ axis2_transport_in_desc_add_param(transport_in, env,
impl_info_param);
- stat = AXIS2_TRANSPORT_IN_DESC_SET_RECV(transport_in, env,
+ stat = axis2_transport_in_desc_set_recv(transport_in, env,
recv);
}
@@ -1073,7 +1073,7 @@
builder_impl->conf->param_container);
if (AXIS2_SUCCESS != status)
{
- AXIS2_TRANSPORT_IN_DESC_FREE(transport_in, env);
+ axis2_transport_in_desc_free(transport_in, env);
return status;
}
/* process OUT_FLOW */
@@ -1083,7 +1083,7 @@
AXIS2_QNAME_FREE(qoutflowst, env);
if (out_flow_element)
{
- AXIS2_TRANSPORT_IN_DESC_FREE(transport_in, env);
+ axis2_transport_in_desc_free(transport_in, env);
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_OUT_FLOW_NOT_ALLOWED_IN_TRS_IN, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -1100,11 +1100,11 @@
flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(conf_builder->
desc_builder, env, in_flow_element, builder_impl->conf->
param_container, in_flow_node);
- status = AXIS2_TRANSPORT_IN_DESC_SET_IN_FLOW(transport_in, env,
+ status = axis2_transport_in_desc_set_in_flow(transport_in, env,
flow);
if (AXIS2_SUCCESS != status)
{
- AXIS2_TRANSPORT_IN_DESC_FREE(transport_in, env);
+ axis2_transport_in_desc_free(transport_in, env);
return status;
}
}
@@ -1122,11 +1122,11 @@
flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(conf_builder->desc_builder,
env, in_fault_flow_element, builder_impl->conf->
param_container, in_fault_flow_node);
- status = AXIS2_TRANSPORT_IN_DESC_SET_FAULT_IN_FLOW(transport_in,
+ status = axis2_transport_in_desc_set_fault_in_flow(transport_in,
env, flow);
if (AXIS2_SUCCESS != status)
{
- AXIS2_TRANSPORT_IN_DESC_FREE(transport_in, env);
+ axis2_transport_in_desc_free(transport_in, env);
return status;
}
}
@@ -1148,7 +1148,7 @@
transport_in, transport_enum);
if (AXIS2_SUCCESS != status)
{
- AXIS2_TRANSPORT_IN_DESC_FREE(transport_in, env);
+ axis2_transport_in_desc_free(transport_in, env);
return status;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_init.c?view=diff&rev=517112&r1=517111&r2=517112
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Sun Mar 11 23:27:51 2007
@@ -188,7 +188,7 @@
{
if (transport_in_map[i])
{
- axis2_transport_receiver_t *listener = AXIS2_TRANSPORT_IN_DESC_GET_RECV(transport_in_map[i], env);
+ axis2_transport_receiver_t *listener = axis2_transport_in_desc_get_recv(transport_in_map[i], env);
if (listener)
{
status = AXIS2_TRANSPORT_RECEIVER_INIT(listener, env, conf_ctx, transport_in_map[i]);
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=517112&r1=517111&r2=517112
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Sun Mar 11 23:27:51 2007
@@ -35,16 +35,15 @@
};
AXIS2_EXTERN axis2_transport_in_desc_t *AXIS2_CALL
-axis2_transport_in_desc_create(
- const axis2_env_t *env,
+axis2_transport_in_desc_create(const axis2_env_t *env,
const AXIS2_TRANSPORT_ENUMS trans_enum)
{
axis2_transport_in_desc_t *transport_in = NULL;
AXIS2_ENV_CHECK(env, NULL);
- transport_in = (axis2_transport_in_desc_t *) AXIS2_MALLOC(env->
- allocator, sizeof(axis2_transport_in_desc_t));
+ transport_in = (axis2_transport_in_desc_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axis2_transport_in_desc_t));
if (NULL == transport_in)
{
@@ -73,8 +72,7 @@
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_free(
- axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_free(axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -82,37 +80,31 @@
if (transport_in->recv)
{
AXIS2_TRANSPORT_RECEIVER_FREE(transport_in->recv, env);
- transport_in->recv = NULL;
}
if (transport_in->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(transport_in->param_container, env);
- transport_in->param_container = NULL;
}
if (transport_in->in_flow)
{
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);
- transport_in->fault_in_flow = NULL;
}
if (transport_in->in_phase)
{
AXIS2_PHASE_FREE(transport_in->in_phase, env);
- transport_in->in_phase = NULL;
}
if (transport_in->fault_phase)
{
AXIS2_PHASE_FREE(transport_in->fault_phase, env);
- transport_in->fault_phase = NULL;
}
AXIS2_FREE(env->allocator, transport_in);
@@ -121,8 +113,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_free_void_arg(
- void *transport_in,
+axis2_transport_in_desc_free_void_arg(void *transport_in,
const axis2_env_t *env)
{
axis2_transport_in_desc_t *transport_in_l = NULL;
@@ -134,8 +125,7 @@
}
AXIS2_TRANSPORT_ENUMS AXIS2_CALL
-axis2_transport_in_desc_get_enum(
- const axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_get_enum(const axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -143,8 +133,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_enum(
- axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_set_enum(axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env,
const AXIS2_TRANSPORT_ENUMS trans_enum)
{
@@ -155,8 +144,7 @@
}
axis2_flow_t *AXIS2_CALL
-axis2_transport_in_desc_get_in_flow(
- const axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_get_in_flow(const axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -164,8 +152,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_in_flow(
- axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_set_in_flow(axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env,
axis2_flow_t *in_flow)
{
@@ -175,23 +162,20 @@
if (transport_in->in_flow)
{
axis2_flow_free(transport_in->in_flow, env);
- transport_in->in_flow = NULL;
}
transport_in->in_flow = in_flow;
return AXIS2_SUCCESS;
}
axis2_flow_t *AXIS2_CALL
-axis2_transport_in_desc_get_fault_in_flow(
- const axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_get_fault_in_flow(const axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env)
{
return transport_in->fault_in_flow;
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_fault_in_flow(
- axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_set_fault_in_flow(axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env,
axis2_flow_t *fault_in_flow)
{
@@ -201,15 +185,13 @@
if (transport_in->fault_in_flow)
{
axis2_flow_free(transport_in->fault_in_flow, env);
- transport_in->fault_in_flow = NULL;
}
transport_in->fault_in_flow = fault_in_flow;
return AXIS2_SUCCESS;
}
axis2_transport_receiver_t *AXIS2_CALL
-axis2_transport_in_desc_get_recv(
- const axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_get_recv(const axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -217,8 +199,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_recv(
- axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_set_recv(axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env,
axis2_transport_receiver_t *recv)
{
@@ -228,7 +209,6 @@
if (transport_in->recv)
{
AXIS2_TRANSPORT_RECEIVER_FREE(transport_in->recv, env);
- transport_in->recv = NULL;
}
transport_in->recv = recv;
@@ -236,8 +216,7 @@
}
axis2_phase_t *AXIS2_CALL
-axis2_transport_in_desc_get_in_phase(
- const axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_get_in_phase(const axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -246,8 +225,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_in_phase(
- axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_set_in_phase(axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env,
axis2_phase_t *in_phase)
{
@@ -257,15 +235,13 @@
if (transport_in->in_phase)
{
AXIS2_PHASE_FREE(transport_in->in_phase, env);
- transport_in->in_phase = NULL;
}
transport_in->in_phase = in_phase;
return AXIS2_SUCCESS;
}
axis2_phase_t *AXIS2_CALL
-axis2_transport_in_desc_get_fault_phase(
- const axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_get_fault_phase(const axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -274,8 +250,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_set_fault_phase(
- axis2_transport_in_desc_t *transport_in,
+axis2_transport_in_desc_set_fault_phase(axis2_transport_in_desc_t *transport_in,
const axis2_env_t *env,
axis2_phase_t *fault_phase)
{
@@ -285,7 +260,6 @@
if (transport_in->fault_phase)
{
AXIS2_PHASE_FREE(transport_in->fault_phase, env);
- transport_in->fault_phase = NULL;
}
transport_in->fault_phase = fault_phase;
return AXIS2_SUCCESS;
@@ -293,8 +267,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_in_desc_add_param(
- axis2_transport_in_desc_t *transport_in_desc,
+axis2_transport_in_desc_add_param(axis2_transport_in_desc_t *transport_in_desc,
const axis2_env_t *env,
axis2_param_t *param)
{
@@ -306,21 +279,18 @@
}
axis2_param_t *AXIS2_CALL
-axis2_transport_in_desc_get_param(
- const axis2_transport_in_desc_t *transport_in_desc,
+axis2_transport_in_desc_get_param(const axis2_transport_in_desc_t *transport_in_desc,
const axis2_env_t *env,
const axis2_char_t *param_name)
{
AXIS2_ENV_CHECK(env, NULL);
- AXIS2_PARAM_CHECK(env->error, param_name, NULL);
return AXIS2_PARAM_CONTAINER_GET_PARAM(transport_in_desc->param_container,
env, param_name);
}
axis2_bool_t AXIS2_CALL
-axis2_transport_in_desc_is_param_locked(
- axis2_transport_in_desc_t *
+axis2_transport_in_desc_is_param_locked(axis2_transport_in_desc_t *
transport_in_desc,
const axis2_env_t *env,
const axis2_char_t *param_name)
@@ -338,4 +308,6 @@
{
return transport_in_desc->param_container;
}
+
+
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=517112&r1=517111&r2=517112
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Sun Mar 11 23:27:51 2007
@@ -689,7 +689,7 @@
{
if (config_impl->transports_in[i])
{
- AXIS2_TRANSPORT_IN_DESC_FREE(config_impl->transports_in[i], env);
+ axis2_transport_in_desc_free(config_impl->transports_in[i], env);
config_impl->transports_in[i] = NULL;
}
}
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=517112&r1=517111&r2=517112
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Sun Mar 11 23:27:51 2007
@@ -756,14 +756,14 @@
{
case AXIS2_IN_FLOW:
{
- flow = AXIS2_TRANSPORT_IN_DESC_GET_IN_FLOW(transport, env);
- phase = AXIS2_TRANSPORT_IN_DESC_GET_IN_PHASE(transport, env);
+ flow = axis2_transport_in_desc_get_in_flow(transport, env);
+ phase = axis2_transport_in_desc_get_in_phase(transport, env);
break;
}
case AXIS2_FAULT_IN_FLOW:
{
- flow = AXIS2_TRANSPORT_IN_DESC_GET_FAULT_IN_FLOW(transport, env);
- phase = AXIS2_TRANSPORT_IN_DESC_GET_FAULT_PHASE(transport, env);
+ flow = axis2_transport_in_desc_get_fault_in_flow(transport, env);
+ phase = axis2_transport_in_desc_get_fault_phase(transport, env);
break;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org