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 sa...@apache.org on 2007/04/02 04:33:38 UTC
svn commit: r524715 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ modules/core/deployment/ modules/core/description/
modules/core/transport/http/receiver/
modules/core/transport/http/server/simple_axis2_server/
Author: samisa
Date: Sun Apr 1 19:33:37 2007
New Revision: 524715
URL: http://svn.apache.org/viewvc?view=rev&rev=524715
Log:
Removed macros form http_receiver
Modified:
webservices/axis2/trunk/c/include/axis2_transport_receiver.h
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.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/transport/http/receiver/http_receiver.c
webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
Modified: webservices/axis2/trunk/c/include/axis2_transport_receiver.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_transport_receiver.h?view=diff&rev=524715&r1=524714&r2=524715
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_transport_receiver.h (original)
+++ webservices/axis2/trunk/c/include/axis2_transport_receiver.h Sun Apr 1 19:33:37 2007
@@ -140,50 +140,78 @@
/**
* @brief Transport Reciever struct
*/
- struct axis2_transport_receiver
+ struct axis2_transport_receiver
{
const axis2_transport_receiver_ops_t *ops;
};
-/*************************** Function macros **********************************/
-
/** Frees the transport receiver.
@sa axis2_transport_receiver#free */
-#define AXIS2_TRANSPORT_RECEIVER_FREE(transport_receiver, env) \
- ((transport_receiver->ops)->free (transport_receiver, env))
+static void AXIS2_CALL
+axis2_transport_receiver_free(axis2_transport_receiver_t *transport_receiver,
+ const axutil_env_t *env)
+{
+ (transport_receiver->ops)->free (transport_receiver, env);
+}
/** Initialize the transport receiver.
@sa axis2_transport_receiver#init */
-#define AXIS2_TRANSPORT_RECEIVER_INIT(transport_receiver, env, axisconf, transport_in) \
- ((transport_receiver->ops)->init (transport_receiver, env, axisconf, transport_in))
+static axis2_status_t AXIS2_CALL
+axis2_transport_receiver_init(axis2_transport_receiver_t *transport_receiver,
+ const axutil_env_t *env,
+ struct axis2_conf_ctx *conf_ctx,
+ struct axis2_transport_in_desc *transport_in)
+{
+ return (transport_receiver->ops)->init (transport_receiver, env,
+ conf_ctx, transport_in);
+}
/** Start
@sa axis2_transport_receiver#start */
-#define AXIS2_TRANSPORT_RECEIVER_START(transport_receiver, env) \
- ((transport_receiver->ops)->start (transport_receiver, env))
+static axis2_status_t AXIS2_CALL
+axis2_transport_receiver_start(axis2_transport_receiver_t *transport_receiver,
+ const axutil_env_t *env)
+{
+ return (transport_receiver->ops)->start (transport_receiver, env);
+}
/** Stop.
@sa axis2_transport_receiver#stop */
-#define AXIS2_TRANSPORT_RECEIVER_STOP(transport_receiver, env) \
- ((transport_receiver->ops)->stop (transport_receiver, env))
+static axis2_status_t AXIS2_CALL
+axis2_transport_receiver_stop(axis2_transport_receiver_t *transport_receiver,
+ const axutil_env_t *env)
+{
+ return (transport_receiver->ops)->stop (transport_receiver, env);
+}
/** Get reply to epr.
@sa axis2_transport_receiver#get_reply_to_epr */
-#define AXIS2_TRANSPORT_RECEIVER_GET_REPLY_TO_EPR(transport_receiver, env, svc_name) \
- ((transport_receiver->ops)->get_reply_to_epr (transport_receiver, env, svc_name))
+static axis2_endpoint_ref_t* AXIS2_CALL
+axis2_transport_receiver_get_reply_to_epr(axis2_transport_receiver_t *transport_receiver,
+ const axutil_env_t *env,
+ const axis2_char_t *svc_name)
+{
+ return (transport_receiver->ops)->get_reply_to_epr (transport_receiver, env, svc_name);
+}
/** Get conf ctx.
@sa axis2_transport_receiver#get_conf_ctx */
-#define AXIS2_TRANSPORT_RECEIVER_GET_CONF_CTX(transport_receiver, env) \
- ((transport_receiver)->ops->get_conf_ctx(transport_receiver, env))
+static struct axis2_conf_ctx *AXIS2_CALL
+axis2_transport_receiver_get_conf_ctx(axis2_transport_receiver_t *transport_receiver,
+ const axutil_env_t *env)
+{
+ return (transport_receiver)->ops->get_conf_ctx(transport_receiver, env);
+}
/** Is running.
@sa axis2_transport_receiver#is_running */
-#define AXIS2_TRANSPORT_RECEIVER_IS_RUNNING(transport_receiver, env) \
- ((transport_receiver)->ops->is_running(transport_receiver, env))
-
-/*************************** End of function macros ***************************/
+static axis2_bool_t AXIS2_CALL
+axis2_transport_receiver_is_running(axis2_transport_receiver_t *transport_receiver,
+ const axutil_env_t *env)
+{
+ return (transport_receiver)->ops->is_running(transport_receiver, env);
+}
/** @} */
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=524715&r1=524714&r2=524715
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c Sun Apr 1 19:33:37 2007
@@ -203,7 +203,7 @@
tl_state->waiting_calls--;
if (tl_state->waiting_calls == 0)
{
- status = AXIS2_TRANSPORT_RECEIVER_STOP(tl_state->listener, env);
+ status = axis2_transport_receiver_stop(tl_state->listener, env);
if (status != AXIS2_SUCCESS)
return status;
@@ -227,7 +227,7 @@
tl_state = listener_manager->listener_map[transport];
if (tl_state)
{
- return AXIS2_TRANSPORT_RECEIVER_GET_REPLY_TO_EPR(tl_state->listener, env, svc_name);
+ return axis2_transport_receiver_get_reply_to_epr(tl_state->listener, env, svc_name);
}
return NULL;
}
@@ -273,7 +273,7 @@
th_env = axis2_init_thread_env(args_list->env);
if (args_list->listener)
{
- AXIS2_TRANSPORT_RECEIVER_START(args_list->listener, th_env);
+ axis2_transport_receiver_start(args_list->listener, th_env);
}
return NULL;
}
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=524715&r1=524714&r2=524715
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Sun Apr 1 19:33:37 2007
@@ -188,7 +188,7 @@
axis2_transport_in_desc_get_recv(transport_in_map[i], env);
if (listener)
{
- status = AXIS2_TRANSPORT_RECEIVER_INIT(listener, env, conf_ctx,
+ 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=524715&r1=524714&r2=524715
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Sun Apr 1 19:33:37 2007
@@ -79,7 +79,7 @@
if (transport_in->recv)
{
- AXIS2_TRANSPORT_RECEIVER_FREE(transport_in->recv, env);
+ axis2_transport_receiver_free(transport_in->recv, env);
}
if (transport_in->param_container)
@@ -209,7 +209,7 @@
if (transport_in->recv)
{
- AXIS2_TRANSPORT_RECEIVER_FREE(transport_in->recv, env);
+ axis2_transport_receiver_free(transport_in->recv, env);
}
transport_in->recv = recv;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c?view=diff&rev=524715&r1=524714&r2=524715
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c Sun Apr 1 19:33:37 2007
@@ -324,7 +324,7 @@
{
if (inst)
{
- AXIS2_TRANSPORT_RECEIVER_FREE(inst, env);
+ axis2_transport_receiver_free(inst, env);
}
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c?view=diff&rev=524715&r1=524714&r2=524715
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c Sun Apr 1 19:33:37 2007
@@ -72,7 +72,7 @@
axutil_allocator_t *allocator = NULL;
if (server)
{
- AXIS2_TRANSPORT_RECEIVER_FREE(server, system_env);
+ axis2_transport_receiver_free(server, system_env);
}
if (env)
{
@@ -172,7 +172,7 @@
}
printf("Started Simple Axis2 HTTP Server ...\n");
- if (AXIS2_TRANSPORT_RECEIVER_START(server, env) == AXIS2_FAILURE)
+ if (axis2_transport_receiver_start(server, env) == AXIS2_FAILURE)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Server start failed: Error code:"
" %d :: %s", env->error->error_number,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org