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/19 12:48:07 UTC
svn commit: r519915 - in /webservices/axis2/trunk/c: include/
modules/core/clientapi/ samples/user_guide/clients/
tools/codegen/samples/client/calculator/
tools/codegen/samples/client/interop_test_svc/
Author: pini
Date: Mon Mar 19 04:48:05 2007
New Revision: 519915
URL: http://svn.apache.org/viewvc?view=rev&rev=519915
Log:
Dropped macros
Modified:
webservices/axis2/trunk/c/include/axis2_callback.h
webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
Modified: webservices/axis2/trunk/c/include/axis2_callback.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_callback.h?view=diff&rev=519915&r1=519914&r2=519915
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_callback.h (original)
+++ webservices/axis2/trunk/c/include/axis2_callback.h Mon Mar 19 04:48:05 2007
@@ -212,58 +212,6 @@
axis2_callback_create(const axis2_env_t *env);
-/** Invokes on complete functions. */
-#define AXIS2_CALLBACK_INVOKE_ON_COMPLETE(callback, env, result) \
- axis2_callback_invoke_on_complete(callback, env, result)
-
-/** Reports error. */
-#define AXIS2_CALLBACK_REPORT_ERROR(callback, env, error) \
- axis2_callback_report_error(callback, env, error)
-
-/** Gets complete status. */
-#define AXIS2_CALLBACK_GET_COMPLETE(callback, env)\
- axis2_callback_get_complete(callback, env)
-
-/** Sets complete status. */
-#define AXIS2_CALLBACK_SET_COMPLETE(callback, env, complete) \
- axis2_callback_set_complete(callback, env, complete)
-
-/** Gets result SOAP envelope. */
-#define AXIS2_CALLBACK_GET_ENVELOPE(callback, env) \
- axis2_callback_get_envelope(callback, env)
-
-/** Sets SOAP envelope. */
-#define AXIS2_CALLBACK_SET_ENVELOPE(callback, env, envelope) \
- axis2_callback_set_envelope(callback, env, envelope)
-
-/** Gets error code. */
-#define AXIS2_CALLBACK_GET_ERROR(callback, env) \
- axis2_callback_get_error(callback, env)
-
-/** Sets error code. */
-#define AXIS2_CALLBACK_SET_ERROR(callback, env, error) \
- axis2_callback_set_error(callback, env, error)
-
-/** Gets data. */
-#define AXIS2_CALLBACK_GET_DATA(callback) \
- axis2_callback_get_data(callback)
-
-/** Sets data. */
-#define AXIS2_CALLBACK_SET_DATA(callback, data) \
- axis2_callback_set_data(callback, data)
-
-/** Sets on complete callback function. */
-#define AXIS2_CALLBACK_SET_ON_COMPLETE(callback, func) \
- axis2_callback_set_on_complete(callback, func)
-
-/** Set on error callback function. */
-#define AXIS2_CALLBACK_SET_ON_ERROR(callback, func) \
- axis2_callback_set_on_error(callback, func)
-
-/** Frees callback struct. */
-#define AXIS2_CALLBACK_FREE(callback, env) \
- axis2_callback_free (callback, env)
-
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?view=diff&rev=519915&r1=519914&r2=519915
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Mon Mar 19 04:48:05 2007
@@ -180,8 +180,8 @@
result = axis2_async_result_create(env, msg_ctx);
if (callback && result)
{
- AXIS2_CALLBACK_INVOKE_ON_COMPLETE(callback, env, result);
- AXIS2_CALLBACK_SET_COMPLETE(callback, env, AXIS2_TRUE);
+ axis2_callback_invoke_on_complete(callback, env, result);
+ axis2_callback_set_complete(callback, env, AXIS2_TRUE);
axis2_msg_ctx_set_soap_envelope(msg_ctx, env, NULL);
}
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=519915&r1=519914&r2=519915
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Mon Mar 19 04:48:05 2007
@@ -251,7 +251,7 @@
if (op_client->callback)
{
- AXIS2_CALLBACK_FREE(op_client->callback, env);
+ axis2_callback_free(op_client->callback, env);
}
op_client->callback = callback;
@@ -528,7 +528,7 @@
if (op_client->callback)
{
- AXIS2_CALLBACK_FREE(op_client->callback, env);
+ axis2_callback_free(op_client->callback, env);
}
if (op_client->op_ctx)
@@ -578,8 +578,8 @@
axis2_op_client_add_msg_ctx(args_list->op_client, th_env,
response);
args_list->op_client->async_result = axis2_async_result_create(th_env, response);
- AXIS2_CALLBACK_INVOKE_ON_COMPLETE(args_list->callback, th_env, args_list->op_client->async_result);
- AXIS2_CALLBACK_SET_COMPLETE(args_list->callback, th_env, AXIS2_TRUE);
+ axis2_callback_invoke_on_complete(args_list->callback, th_env, args_list->op_client->async_result);
+ axis2_callback_set_complete(args_list->callback, th_env, AXIS2_TRUE);
/* clean up memory */
axis2_async_result_free(args_list->op_client->async_result, th_env);
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=519915&r1=519914&r2=519915
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Mon Mar 19 04:48:05 2007
@@ -636,7 +636,7 @@
index = AXIS2_OPTIONS_GET_TIMEOUT_IN_MILLI_SECONDS(svc_client->options, env) / 10;
- while (!(AXIS2_CALLBACK_GET_COMPLETE(callback, env)))
+ while (!(axis2_callback_get_complete(callback, env)))
{
/*wait till the response arrives*/
if (index-- >= 0)
@@ -676,7 +676,7 @@
}
}
- soap_envelope = AXIS2_CALLBACK_GET_ENVELOPE(callback, env);
+ soap_envelope = axis2_callback_get_envelope(callback, env);
/* start of hack to get rid of memory leak */
msg_ctx = axis2_msg_ctx_create(env,
@@ -689,9 +689,9 @@
/* process the result of the invocation */
if (!soap_envelope)
{
- if (AXIS2_CALLBACK_GET_ERROR(callback, env) != AXIS2_ERROR_NONE)
+ if (axis2_callback_get_error(callback, env) != AXIS2_ERROR_NONE)
{
- AXIS2_ERROR_SET(env->error, AXIS2_CALLBACK_GET_ERROR(callback, env), AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, axis2_callback_get_error(callback, env), AXIS2_FAILURE);
return NULL;
}
}
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c?view=diff&rev=519915&r1=519914&r2=519915
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking.c Mon Mar 19 04:48:05 2007
@@ -101,10 +101,10 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, echo_callback_on_complete);
+ axis2_callback_set_on_complete(callback, echo_callback_on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, echo_callback_on_error);
+ axis2_callback_set_on_error(callback, echo_callback_on_error);
/* Send request */
@@ -157,7 +157,7 @@
printf("inside on_complete_callback function\n");
- soap_envelope = AXIS2_CALLBACK_GET_ENVELOPE(callback, env);
+ soap_envelope = axis2_callback_get_envelope(callback, env);
if (!soap_envelope)
{
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c?view=diff&rev=519915&r1=519914&r2=519915
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_non_blocking_dual.c Mon Mar 19 04:48:05 2007
@@ -114,10 +114,10 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, echo_callback_on_complete);
+ axis2_callback_set_on_complete(callback, echo_callback_on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, echo_callback_on_error);
+ axis2_callback_set_on_error(callback, echo_callback_on_error);
/* Send request */
@@ -171,7 +171,7 @@
printf("inside on_complete_callback function\n");
- soap_envelope = AXIS2_CALLBACK_GET_ENVELOPE(callback, env);
+ soap_envelope = axis2_callback_get_envelope(callback, env);
if (!soap_envelope)
{
Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c?view=diff&rev=519915&r1=519914&r2=519915
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/calculator/axis2_stub_calculator.c Mon Mar 19 04:48:05 2007
@@ -229,9 +229,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -333,9 +333,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -437,9 +437,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -541,9 +541,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
Modified: webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c?view=diff&rev=519915&r1=519914&r2=519915
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/samples/client/interop_test_svc/axis2_stub_interop_test_port_type_doc_service.c Mon Mar 19 04:48:05 2007
@@ -349,9 +349,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -453,9 +453,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -557,9 +557,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -661,9 +661,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -765,9 +765,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -869,9 +869,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -973,9 +973,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -1077,9 +1077,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -1181,9 +1181,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -1285,9 +1285,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -1389,9 +1389,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -1493,9 +1493,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -1597,9 +1597,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
@@ -1701,9 +1701,9 @@
callback = axis2_callback_create(env);
/* Set our on_complete fucntion pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_COMPLETE(callback, on_complete);
+ axis2_callback_set_on_complete(callback, on_complete);
/* Set our on_error function pointer to the callback object */
- AXIS2_CALLBACK_SET_ON_ERROR(callback, on_error);
+ axis2_callback_set_on_error(callback, on_error);
/* Send request */
AXIS2_SVC_CLIENT_SEND_RECEIVE_NON_BLOCKING(svc_client, env, payload, callback);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org