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/12 07:52:42 UTC
svn commit: r517115 - 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:52:41 2007
New Revision: 517115
URL: http://svn.apache.org/viewvc?view=rev&rev=517115
Log:
Macros dropped. Fixed indentation.
Modified:
webservices/axis2/trunk/c/include/axis2_transport_out_desc.h
webservices/axis2/trunk/c/modules/core/clientapi/op_client.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_out_desc.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
Modified: webservices/axis2/trunk/c/include/axis2_transport_out_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_out_desc.h?view=diff&rev=517115&r1=517114&r2=517115
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_out_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_out_desc.h Sun Mar 11 23:52:41 2007
@@ -282,69 +282,6 @@
axis2_transport_out_desc_free_void_arg(void *transport_out,
const axis2_env_t *env);
-/** Frees transport out description. */
-#define AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out_desc, env) \
- axis2_transport_out_desc_free (transport_out_desc, env)
-
-/** Gets transport enum. */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(transport_out_desc, env) \
- axis2_transport_out_desc_get_enum (transport_out_desc, env)
-
-/** Sets transport enum. */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_ENUM(transport_out_desc, env, trans_enum) \
- axis2_transport_out_desc_set_enum (transport_out_desc, env, trans_enum)
-
-/** Gets out flow. */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_OUT_FLOW(transport_out_desc, env) \
- axis2_transport_out_desc_get_out_flow (transport_out_desc, env)
-
-/** Sets out flow. */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_OUT_FLOW(transport_out_desc, env, out_flow) \
- axis2_transport_out_desc_set_out_flow (transport_out_desc, env, out_flow)
-
-/** Gets fault out flow. */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_FAULT_OUT_FLOW(transport_out_desc, env) \
- axis2_transport_out_desc_get_fault_out_flow (transport_out_desc, env)
-
-/** Sets fault out flow. */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_FAULT_OUT_FLOW(transport_out_desc, env, fault_out_flow) \
- axis2_transport_out_desc_set_fault_out_flow (transport_out_desc, env, fault_out_flow)
-
-/** Gets transport sender. */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out_desc, env) \
- axis2_transport_out_desc_get_sender (transport_out_desc, env)
-
-/** Sets transport sender. */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_SENDER(transport_out_desc, env, sender) \
- axis2_transport_out_desc_set_sender (transport_out_desc, env, sender)
-
-/** Gets out phase. */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_OUT_PHASE(transport_out_desc, env) \
- axis2_transport_out_desc_get_out_phase (transport_out_desc, env)
-
-/** Sets out phase. */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_OUT_PHASE(transport_out_desc, env, out_phase) \
- axis2_transport_out_desc_set_out_phase (transport_out_desc, env, out_phase)
-
-/** Gets fault phase. */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_FAULT_PHASE(transport_out_desc, env) \
- axis2_transport_out_desc_get_fault_phase (transport_out_desc, env)
-
-/** Sets fault phase. */
-#define AXIS2_TRANSPORT_OUT_DESC_SET_FAULT_PHASE(transport_out_desc, env, fault_phase) \
- axis2_transport_out_desc_set_fault_phase (transport_out_desc, env, fault_phase)
-
-/** Adds given parameter. */
-#define AXIS2_TRANSPORT_OUT_DESC_ADD_PARAM(transport_out_desc, env, param) \
- axis2_transport_out_desc_add_param (transport_out_desc, env, param)
-
-/** Gets named parameter. */
-#define AXIS2_TRANSPORT_OUT_DESC_GET_PARAM(transport_out_desc, env, param_name) \
- axis2_transport_out_desc_get_param (transport_out_desc, env, param_name)
-
-/** Checks if the named parameter locked. */
-#define AXIS2_TRANSPORT_OUT_DESC_IS_PARAM_LOCKED(transport_out_desc, env, param_name) \
- axis2_transport_out_desc_is_param_locked (transport_out_desc, env, param_name)
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=517115&r1=517114&r2=517115
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Sun Mar 11 23:52:41 2007
@@ -480,7 +480,7 @@
if (conf)
{
transport_in = AXIS2_CONF_GET_TRANSPORT_IN(conf, env,
- AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(transport_out, env));
+ axis2_transport_out_desc_get_enum(transport_out, env));
}
}
}
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=517115&r1=517114&r2=517115
==============================================================================
--- 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:52:41 2007
@@ -237,7 +237,7 @@
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);
+ axis2_transport_out_desc_get_enum(transport_out_desc, env);
msg_ctx->msg_info_headers = axis2_msg_info_headers_create(env, NULL, NULL);
if (!(msg_ctx->msg_info_headers))
@@ -964,7 +964,7 @@
{
msg_ctx->transport_out_desc = transport_out_desc;
msg_ctx->transport_out_desc_enum =
- AXIS2_TRANSPORT_OUT_DESC_GET_ENUM(transport_out_desc, env);
+ axis2_transport_out_desc_get_enum(transport_out_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=517115&r1=517114&r2=517115
==============================================================================
--- 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:52:41 2007
@@ -786,7 +786,7 @@
impl_info_param = axis2_param_create(env, class_name, NULL);
if (!impl_info_param)
{
- AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
+ axis2_transport_out_desc_free(transport_out, env);
return AXIS2_FAILURE;
}
dll_desc = axis2_dll_desc_create(env);
@@ -811,13 +811,13 @@
axis2_dll_desc_free_void_arg);
axis2_class_loader_init(env);
transport_sender = axis2_class_loader_create_dll(env, impl_info_param);
- AXIS2_TRANSPORT_OUT_DESC_ADD_PARAM(transport_out, env,
+ axis2_transport_out_desc_add_param(transport_out, env,
impl_info_param);
- status = AXIS2_TRANSPORT_OUT_DESC_SET_SENDER(transport_out, env,
+ status = axis2_transport_out_desc_set_sender(transport_out, env,
transport_sender);
if (AXIS2_SUCCESS != status)
{
- AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
+ axis2_transport_out_desc_free(transport_out, env);
return status;
}
@@ -833,7 +833,7 @@
param_container);
if (AXIS2_SUCCESS != status)
{
- AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
+ axis2_transport_out_desc_free(transport_out, env);
return status;
}
/* process IN_FLOW */
@@ -843,7 +843,7 @@
AXIS2_QNAME_FREE(qinflowst, env);
if (in_flow_element)
{
- AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
+ axis2_transport_out_desc_free(transport_out, env);
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_IN_FLOW_NOT_ALLOWED_IN_TRS_OUT, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -859,10 +859,10 @@
flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(conf_builder->desc_builder,
env, out_flow_element, builder_impl->conf->param_container,
out_flow_node);
- status = AXIS2_TRANSPORT_OUT_DESC_SET_OUT_FLOW(transport_out, env, flow);
+ status = axis2_transport_out_desc_set_out_flow(transport_out, env, flow);
if (AXIS2_SUCCESS != status)
{
- AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
+ axis2_transport_out_desc_free(transport_out, env);
return status;
}
}
@@ -876,7 +876,7 @@
AXIS2_QNAME_FREE(qinfaultflowst, env);
if (in_fault_flow_element)
{
- AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
+ axis2_transport_out_desc_free(transport_out, env);
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_IN_FLOW_NOT_ALLOWED_IN_TRS_OUT, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -895,10 +895,10 @@
flow = AXIS2_DESC_BUILDER_PROCESS_FLOW(conf_builder->desc_builder,
env, out_fault_flow_element, builder_impl->conf->param_container,
out_fault_flow_node);
- status = AXIS2_TRANSPORT_OUT_DESC_SET_FAULT_OUT_FLOW(transport_out, env, flow);
+ status = axis2_transport_out_desc_set_fault_out_flow(transport_out, env, flow);
if (AXIS2_SUCCESS != status)
{
- AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
+ axis2_transport_out_desc_free(transport_out, env);
return status;
}
}
@@ -908,7 +908,7 @@
transport_out, transport_enum);
if (AXIS2_SUCCESS != status)
{
- AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
+ axis2_transport_out_desc_free(transport_out, 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=517115&r1=517114&r2=517115
==============================================================================
--- 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:52:41 2007
@@ -203,7 +203,7 @@
if (transport_out_map[i])
{
axis2_transport_sender_t *sender =
- AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out_map[i], env);
+ axis2_transport_out_desc_get_sender(transport_out_map[i], env);
if (sender)
{
status = AXIS2_TRANSPORT_SENDER_INIT(sender, env, conf_ctx, transport_out_map[i]);
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=517115&r1=517114&r2=517115
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Sun Mar 11 23:52:41 2007
@@ -30,8 +30,7 @@
};
AXIS2_EXTERN axis2_transport_out_desc_t *AXIS2_CALL
-axis2_transport_out_desc_create(
- const axis2_env_t *env,
+axis2_transport_out_desc_create(const axis2_env_t *env,
const AXIS2_TRANSPORT_ENUMS trans_enum)
{
axis2_transport_out_desc_t *transport_out = NULL;
@@ -67,8 +66,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_free(
- axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_free(axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -76,37 +74,31 @@
if (transport_out->sender)
{
AXIS2_TRANSPORT_SENDER_FREE(transport_out->sender, env);
- transport_out->sender = NULL;
}
if (transport_out->param_container)
{
AXIS2_PARAM_CONTAINER_FREE(transport_out->param_container, env);
- transport_out->param_container = NULL;
}
if (transport_out->out_flow)
{
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);
- transport_out->fault_out_flow = NULL;
}
if (transport_out->out_phase)
{
AXIS2_PHASE_FREE(transport_out->out_phase, env);
- transport_out->out_phase = NULL;
}
if (transport_out->fault_phase)
{
AXIS2_PHASE_FREE(transport_out->fault_phase, env);
- transport_out->fault_phase = NULL;
}
AXIS2_FREE(env->allocator, transport_out);
@@ -115,8 +107,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_free_void_arg(
- void *transport_out,
+axis2_transport_out_desc_free_void_arg(void *transport_out,
const axis2_env_t *env)
{
axis2_transport_out_desc_t *transport_out_l = NULL;
@@ -128,8 +119,7 @@
}
AXIS2_TRANSPORT_ENUMS AXIS2_CALL
-axis2_transport_out_desc_get_enum(
- const axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_get_enum(const axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -137,8 +127,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_enum(
- axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_set_enum(axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env,
const AXIS2_TRANSPORT_ENUMS trans_enum)
{
@@ -148,8 +137,7 @@
}
axis2_flow_t *AXIS2_CALL
-axis2_transport_out_desc_get_out_flow(
- const axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_get_out_flow(const axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -157,8 +145,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_out_flow(
- axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_set_out_flow(axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env,
axis2_flow_t *out_flow)
{
@@ -168,23 +155,20 @@
if (transport_out->out_flow)
{
axis2_flow_free(transport_out->out_flow, env);
- transport_out->out_flow = NULL;
}
transport_out->out_flow = out_flow;
return AXIS2_SUCCESS;
}
axis2_flow_t *AXIS2_CALL
-axis2_transport_out_desc_get_fault_out_flow(
- const axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_get_fault_out_flow(const axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env)
{
return transport_out->fault_out_flow;
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_fault_out_flow(
- axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_set_fault_out_flow(axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env,
axis2_flow_t *fault_out_flow)
{
@@ -194,15 +178,13 @@
if (transport_out->fault_out_flow)
{
axis2_flow_free(transport_out->fault_out_flow, env);
- transport_out->fault_out_flow = NULL;
}
transport_out->fault_out_flow = fault_out_flow;
return AXIS2_SUCCESS;
}
axis2_transport_sender_t *AXIS2_CALL
-axis2_transport_out_desc_get_sender(
- const axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_get_sender(const axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -210,8 +192,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_sender(
- axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_set_sender(axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env,
axis2_transport_sender_t *sender)
{
@@ -221,7 +202,6 @@
if (transport_out->sender)
{
AXIS2_TRANSPORT_SENDER_FREE(transport_out->sender, env);
- transport_out->sender = NULL;
}
transport_out->sender = sender;
@@ -229,8 +209,7 @@
}
axis2_phase_t *AXIS2_CALL
-axis2_transport_out_desc_get_out_phase(
- const axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_get_out_phase(const axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -239,8 +218,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_out_phase(
- axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_set_out_phase(axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env,
axis2_phase_t *out_phase)
{
@@ -250,15 +228,13 @@
if (transport_out->out_phase)
{
AXIS2_PHASE_FREE(transport_out->out_phase, env);
- transport_out->out_phase = NULL;
}
transport_out->out_phase = out_phase;
return AXIS2_SUCCESS;
}
axis2_phase_t *AXIS2_CALL
-axis2_transport_out_desc_get_fault_phase(
- const axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_get_fault_phase(const axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -267,8 +243,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_set_fault_phase(
- axis2_transport_out_desc_t *transport_out,
+axis2_transport_out_desc_set_fault_phase(axis2_transport_out_desc_t *transport_out,
const axis2_env_t *env,
axis2_phase_t *fault_phase)
{
@@ -278,7 +253,6 @@
if (transport_out->fault_phase)
{
AXIS2_PHASE_FREE(transport_out->fault_phase, env);
- transport_out->fault_phase = NULL;
}
transport_out->fault_phase = fault_phase;
return AXIS2_SUCCESS;
@@ -286,8 +260,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_transport_out_desc_add_param(
- axis2_transport_out_desc_t *transport_out_desc,
+axis2_transport_out_desc_add_param(axis2_transport_out_desc_t *transport_out_desc,
const axis2_env_t *env,
axis2_param_t *param)
{
@@ -295,25 +268,22 @@
AXIS2_PARAM_CHECK(env->error, param, AXIS2_FAILURE);
return AXIS2_PARAM_CONTAINER_ADD_PARAM(transport_out_desc->
- param_container, env, param);
+ param_container, env, param);
}
axis2_param_t *AXIS2_CALL
-axis2_transport_out_desc_get_param(
- const axis2_transport_out_desc_t *transport_out_desc,
+axis2_transport_out_desc_get_param(const axis2_transport_out_desc_t *transport_out_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_out_desc->param_container,
- env, param_name);
+ env, param_name);
}
axis2_bool_t AXIS2_CALL
-axis2_transport_out_desc_is_param_locked(
- axis2_transport_out_desc_t *
+axis2_transport_out_desc_is_param_locked(axis2_transport_out_desc_t *
transport_out_desc,
const axis2_env_t *env,
const axis2_char_t *param_name)
@@ -322,7 +292,7 @@
AXIS2_PARAM_CHECK(env->error, param_name, AXIS2_FAILURE);
return AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(transport_out_desc->
- param_container, env, param_name);
+ param_container, env, param_name);
}
AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
@@ -331,4 +301,6 @@
{
return transport_out_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=517115&r1=517114&r2=517115
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/conf.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/conf.c Sun Mar 11 23:52:41 2007
@@ -698,7 +698,7 @@
{
if (config_impl->transports_out[i])
{
- AXIS2_TRANSPORT_OUT_DESC_FREE(config_impl->transports_out[i], env);
+ axis2_transport_out_desc_free(config_impl->transports_out[i], env);
config_impl->transports_out[i] = NULL;
}
}
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=517115&r1=517114&r2=517115
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Sun Mar 11 23:52:41 2007
@@ -324,7 +324,7 @@
if (transport_out)
{
- transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out, env);
+ transport_sender = axis2_transport_out_desc_get_sender(transport_out, env);
if (transport_sender)
{
AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);
@@ -491,7 +491,7 @@
transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
if (transport_out)
- transport_sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out, env);
+ transport_sender = axis2_transport_out_desc_get_sender(transport_out, env);
if (transport_sender)
AXIS2_TRANSPORT_SENDER_INVOKE(transport_sender, env, msg_ctx);
}
@@ -1025,7 +1025,7 @@
transport_out = AXIS2_MSG_CTX_GET_TRANSPORT_OUT_DESC(msg_ctx, env);
if (transport_out)
{
- sender = AXIS2_TRANSPORT_OUT_DESC_GET_SENDER(transport_out, env);
+ sender = axis2_transport_out_desc_get_sender(transport_out, env);
if (sender)
{
status = AXIS2_TRANSPORT_SENDER_INVOKE(sender, env, msg_ctx);
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=517115&r1=517114&r2=517115
==============================================================================
--- 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:52:41 2007
@@ -886,14 +886,14 @@
{
case AXIS2_OUT_FLOW:
{
- flow = AXIS2_TRANSPORT_OUT_DESC_GET_OUT_FLOW(transport, env);
- phase = AXIS2_TRANSPORT_OUT_DESC_GET_OUT_PHASE(transport, env);
+ flow = axis2_transport_out_desc_get_out_flow(transport, env);
+ phase = axis2_transport_out_desc_get_out_phase(transport, env);
break;
}
case AXIS2_FAULT_OUT_FLOW:
{
- flow = AXIS2_TRANSPORT_OUT_DESC_GET_FAULT_OUT_FLOW(transport, env);
- phase = AXIS2_TRANSPORT_OUT_DESC_GET_FAULT_PHASE(transport, env);
+ flow = axis2_transport_out_desc_get_fault_out_flow(transport, env);
+ phase = axis2_transport_out_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