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/03/15 14:16:11 UTC
svn commit: r518623 [1/17] - in /webservices/axis2/trunk/c: build/win32/
include/ modules/core/clientapi/ modules/core/deployment/
modules/core/engine/ modules/core/phaseresolver/ modules/core/receivers/
modules/core/transport/http/receiver/ modules/co...
Author: samisa
Date: Thu Mar 15 06:16:07 2007
New Revision: 518623
URL: http://svn.apache.org/viewvc?view=rev&rev=518623
Log:
Dropped ops; fixed formatting; removed unused functions and commented blocks of code;
Modified:
webservices/axis2/trunk/c/build/win32/configure.in
webservices/axis2/trunk/c/include/axis2_async_result.h
webservices/axis2/trunk/c/include/axis2_callback.h
webservices/axis2/trunk/c/include/axis2_callback_recv.h
webservices/axis2/trunk/c/include/axis2_conf.h
webservices/axis2/trunk/c/include/axis2_conf_init.h
webservices/axis2/trunk/c/include/axis2_disp.h
webservices/axis2/trunk/c/include/axis2_engine.h
webservices/axis2/trunk/c/include/axis2_listener_manager.h
webservices/axis2/trunk/c/include/axis2_mep_client.h
webservices/axis2/trunk/c/include/axis2_msg_recv.h
webservices/axis2/trunk/c/include/axis2_op_client.h
webservices/axis2/trunk/c/include/axis2_options.h
webservices/axis2/trunk/c/include/axis2_phase.h
webservices/axis2/trunk/c/include/axis2_phase_holder.h
webservices/axis2/trunk/c/include/axis2_phase_resolver.h
webservices/axis2/trunk/c/include/axis2_phases_info.h
webservices/axis2/trunk/c/include/axis2_stub.h
webservices/axis2/trunk/c/include/axis2_svc_client.h
webservices/axis2/trunk/c/include/axis2_svr_callback.h
webservices/axis2/trunk/c/modules/core/clientapi/async_result.c
webservices/axis2/trunk/c/modules/core/clientapi/callback.c
webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/clientapi/options.c
webservices/axis2/trunk/c/modules/core/clientapi/stub.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
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/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/axis2_disp_checker.h
webservices/axis2/trunk/c/modules/core/engine/axis2_event.h
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/disp.c
webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/engine/event.c
webservices/axis2/trunk/c/modules/core/engine/phase.c
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_body_disp.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/trunk/c/modules/core/receivers/svr_callback.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
Modified: webservices/axis2/trunk/c/build/win32/configure.in
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/configure.in?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/build/win32/configure.in (original)
+++ webservices/axis2/trunk/c/build/win32/configure.in Thu Mar 15 06:16:07 2007
@@ -1,7 +1,7 @@
ENABLE_SSL = 0
ENABLE_LIBCURL= 0
-LIBXML2_BIN_DIR = E:\libxml2-2.6.27.win32
-ICONV_BIN_DIR = E:\iconv-1.9.2.win32
+LIBXML2_BIN_DIR = E:\libxml2-2.6.23.win32
+ICONV_BIN_DIR = E:\iconv-1.9.1.win32
ZLIB_BIN_DIR=E:\zlib-1.2.3.win32
APACHE_BIN_DIR = E:\Apache22
LIBXSLT_BIN_DIR = E:\libxslt-1.1.17.win32
Modified: webservices/axis2/trunk/c/include/axis2_async_result.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_async_result.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_async_result.h (original)
+++ webservices/axis2/trunk/c/include/axis2_async_result.h Thu Mar 15 06:16:07 2007
@@ -41,62 +41,39 @@
{
#endif
-
- /** Type name for struct axis2_async_result_ops */
- typedef struct axis2_async_result_ops axis2_async_result_ops_t;
/** Type name for struct axis2_async_result */
typedef struct axis2_async_result axis2_async_result_t;
+ /**
+ * Gets the SOAP envelope stored inside the resulting message context.
+ * @param async_result pointer to async result struct
+ * @param env pointer to environment struct
+ * @return pointer to the result SOAP envelope in the message context.
+ */
+ AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
+ axis2_async_result_get_envelope(axis2_async_result_t *async_result,
+ const axis2_env_t *env);
+
/**
- * async_result ops struct.
- * Encapsulator struct for ops of axis2_async_result.
+ * Gets the result in the form of message context.
+ * @param async_result pointer to async result struct
+ * @param env pointer to environment struct
+ * @return pointer to result message context
*/
- struct axis2_async_result_ops
- {
- /**
- * Gets the SOAP envelope stored inside the resulting message context.
- * @param async_result pointer to async result struct
- * @param env pointer to environment struct
- * @return pointer to the result SOAP envelope in the message context.
- */
- axiom_soap_envelope_t *(AXIS2_CALL *
- get_envelope)(
- axis2_async_result_t *async_result,
- const axis2_env_t *env);
-
-
- /**
- * Gets the result in the form of message context.
- * @param async_result pointer to async result struct
- * @param env pointer to environment struct
- * @return pointer to result message context
- */
- axis2_msg_ctx_t *(AXIS2_CALL *
- get_result)(
- axis2_async_result_t *async_result,
- const axis2_env_t *env);
-
- /**
- * Frees the async result.
- * @param async_result pointer to async result struct
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_async_result_t *async_result,
- const axis2_env_t *env);
- };
+ AXIS2_EXTERN axis2_msg_ctx_t *AXIS2_CALL
+ axis2_async_result_get_result(axis2_async_result_t *async_result,
+ const axis2_env_t *env);
/**
- * async result struct.
+ * Frees the async result.
+ * @param async_result pointer to async result struct
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_async_result
- {
- /** operations of async result */
- axis2_async_result_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_async_result_free(axis2_async_result_t *async_result,
+ const axis2_env_t *env);
/** Creates an async result struct to help deal with results of asynchronous
* invocations.
@@ -106,24 +83,20 @@
* @return newly created async_result struct
*/
AXIS2_EXTERN axis2_async_result_t *AXIS2_CALL
- axis2_async_result_create(
- const axis2_env_t *env,
+ axis2_async_result_create(const axis2_env_t *env,
axis2_msg_ctx_t *result);
-/** Gets the envelope.
- @sa axis2_async_result_ops#get_envelope*/
+/** Gets the envelope. */
#define AXIS2_ASYNC_RESULT_GET_ENVELOPE(async_result, env) \
- ((async_result)->ops->get_envelope(async_result, env))
+ axis2_async_result_get_envelope(async_result, env)
-/** Gets the result.
- @sa axis2_async_result_ops#get_result*/
+/** Gets the result. */
#define AXIS2_ASYNC_RESULT_GET_RESULT(async_result, env) \
- ((async_result)->ops->get_result(async_result, env))
+ axis2_async_result_get_result(async_result, env)
-/** Free.
- @sa axis2_async_result_ops#free*/
+/** Free. */
#define AXIS2_ASYNC_RESULT_FREE(async_result, env) \
- ((async_result)->ops->free (async_result, env))
+ axis2_async_result_free (async_result, env)
/** @} */
#ifdef __cplusplus
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=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_callback.h (original)
+++ webservices/axis2/trunk/c/include/axis2_callback.h Thu Mar 15 06:16:07 2007
@@ -43,224 +43,165 @@
{
#endif
- /** Type name for axis2_callback_ops */
- typedef struct axis2_callback_ops axis2_callback_ops_t;
/** Type name for axis2_callback */
typedef struct axis2_callback axis2_callback_t;
/** Type name for function pointer to be called on complete of callback */
- typedef axis2_status_t (AXIS2_CALL *
- axis2_on_complete_func_ptr)(axis2_callback_t *,
+ typedef axis2_status_t AXIS2_CALL
+ axis2_on_complete_func_ptr(axis2_callback_t *,
const axis2_env_t *);
/** Type name for function pointer to be called on error of callback */
- typedef axis2_status_t (AXIS2_CALL *
- axis2_on_error_func_ptr)(axis2_callback_t *,
+ typedef axis2_status_t AXIS2_CALL
+ axis2_on_error_func_ptr(axis2_callback_t *,
const axis2_env_t *, int);
/**
- * callback ops struct.
- * Encapsulator struct for ops of axis2_callback.
+ * This function is called once the asynchronous operation is successfully
+ * completed and the result is available.
+ * @param callback pointer to callback struct
+ * @param env pointer to environment struct
+ * @param result pointer to async result
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_callback_invoke_on_complete(axis2_callback_t *callback,
+ const axis2_env_t *env,
+ axis2_async_result_t *result);
+
+ /**
+ * This function is called once the asynchronous operation fails and
+ * the failure code returns.
+ * @param callback pointer to callback struct
+ * @param env pointer to environment struct
+ * @param exception error code representing the error
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_callback_report_error(axis2_callback_t *callback,
+ const axis2_env_t *env,
+ const int exception);
+
+ /**
+ * Gets the complete status for the callback. This method is useful
+ * for polling (busy waiting).
+ * e.g.
+ * <code>
+ * <pre>
+ * while(!AXIS2_CALLBACK_GET_COMPLETE(callback, env)
+ * {
+ * sleep(10);
+ * }
+ * // do whatever you need here
+ * </pre>
+ * </code>
+ * @param callback pointer to callback struct
+ * @param env pointer to environment struct
+ * @return AXIS2_TRUE if callback is complete, else AXIS2_FALSE
+ */
+ AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+ axis2_callback_get_complete(const axis2_callback_t *callback,
+ const axis2_env_t *env);
+
+ /**
+ * Sets the complete status.
+ * @param callback pointer to callback struct
+ * @param env pointer to environment struct
+ * @param complete bool value representing the status
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_callback_set_complete(axis2_callback_t *callback,
+ const axis2_env_t *env,
+ const axis2_bool_t complete);
+
+ /**
+ * Gets the resulting SOAP envelope.
+ * @param callback pointer to callback struct
+ * @param env pointer to environment struct
+ * @return result SOAP envelope if present, else NULL
+ */
+ AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
+ axis2_callback_get_envelope(const axis2_callback_t *callback,
+ const axis2_env_t *env);
+
+ /**
+ * Sets the SOAP envelope.
+ * @param callback pointer to callback struct
+ * @param env pointer to environment struct
+ * @param envelope pointer to SOAP envelope
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_callback_set_envelope(axis2_callback_t *callback,
+ const axis2_env_t *env,
+ axiom_soap_envelope_t *envelope);
+
+ /**
+ * Gets error code representing the error.
+ * @param callback pointer to callback struct
+ * @param env pointer to environment struct
+ * @return error code representing the error
+ */
+ AXIS2_EXTERN int AXIS2_CALL
+ axis2_callback_get_error(const axis2_callback_t *callback,
+ const axis2_env_t *env);
+
+ /**
+ * Sets the error code.
+ * @param callback pointer to callback struct
+ * @param env pointer to environment struct
+ * @param error error code representing the error
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_callback_set_error(axis2_callback_t *callback,
+ const axis2_env_t *env,
+ const int error);
+
+ /**
+ * Sets the callback data.
+ * @param callback pointer to callback struct
+ * @param data pointer to data
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_callback_set_data(axis2_callback_t *callback,
+ void *data);
+
+ /**
+ * Gets the callback data.
+ * @param callback pointer to callback struct
+ * @return pointer to callback data
+ */
+ AXIS2_EXTERN void *AXIS2_CALL
+ axis2_callback_get_data(const axis2_callback_t *callback);
+
+ /**
+ * Sets the on complete callback function.
+ * @param callback pointer to callback struct
+ * @param f on complete callback function pointer
*/
- struct axis2_callback_ops
- {
- /**
- * This function is called once the asynchronous operation is successfully
- * completed and the result is available.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @param result pointer to async result
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- invoke_on_complete)(
- axis2_callback_t *callback,
- const axis2_env_t *env,
- axis2_async_result_t *result);
-
- /**
- * This function is called by invoke_on_complete.
- * Users could provide this method so that they can define what to be
- * done when the callback returns on completion.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- on_complete)(
- axis2_callback_t *callback,
- const axis2_env_t *env);
-
- /**
- * This function is called once the asynchronous operation fails and
- * the failure code returns.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @param exception error code representing the error
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- report_error)(
- axis2_callback_t *callback,
- const axis2_env_t *env,
- const int exception);
-
- /**
- * This function is called by report_error.
- * Users could provide this method so that they can define what to be done
- * when the callback returns an error.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @param exception error code representing the error
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- on_error)(
- axis2_callback_t *callback,
- const axis2_env_t *env,
- const int exception);
-
- /**
- * Gets the complete status for the callback. This method is useful
- * for polling (busy waiting).
- * e.g.
- * <code>
- * <pre>
- * while(!AXIS2_CALLBACK_GET_COMPLETE(callback, env))
- * {
- * sleep(10);
- * }
- * // do whatever you need here
- * </pre>
- * </code>
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @return AXIS2_TRUE if callback is complete, else AXIS2_FALSE
- */
- axis2_bool_t (AXIS2_CALL *
- get_complete)(
- const axis2_callback_t *callback,
- const axis2_env_t *env);
-
- /**
- * Sets the complete status.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @param complete bool value representing the status
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_complete)(
- axis2_callback_t *callback,
- const axis2_env_t *env,
- const axis2_bool_t complete);
-
- /**
- * Gets the resulting SOAP envelope.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @return result SOAP envelope if present, else NULL
- */
- axiom_soap_envelope_t *(AXIS2_CALL *
- get_envelope)(
- const axis2_callback_t *callback,
- const axis2_env_t *env);
-
- /**
- * Sets the SOAP envelope.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @param envelope pointer to SOAP envelope
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_envelope)(
- axis2_callback_t *callback,
- const axis2_env_t *env,
- axiom_soap_envelope_t *envelope);
-
- /**
- * Gets error code representing the error.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @return error code representing the error
- */
- int (AXIS2_CALL *
- get_error)(
- const axis2_callback_t *callback,
- const axis2_env_t *env);
-
- /**
- * Sets the error code.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @param error error code representing the error
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_error)(
- axis2_callback_t *callback,
- const axis2_env_t *env,
- const int error);
-
- /**
- * Sets the callback data.
- * @param callback pointer to callback struct
- * @param data pointer to data
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- set_data)(
- axis2_callback_t *callback,
- void *data);
-
- /**
- * Gets the callback data.
- * @param callback pointer to callback struct
- * @return pointer to callback data
- */
- void *(AXIS2_CALL *
- get_data)(
- const axis2_callback_t *callback);
-
- /**
- * Sets the on complete callback function.
- * @param callback pointer to callback struct
- * @param f on complete callback function pointer
- */
- void (AXIS2_CALL *
- set_on_complete)(
- axis2_callback_t *callback,
- axis2_on_complete_func_ptr f);
-
- /**
- * Sets the on error callback function.
- * @param callback pointer to callback struct
- * @param f on error callback function pointer
- */
- void (AXIS2_CALL *
- set_on_error)(
- axis2_callback_t *callback,
- axis2_on_error_func_ptr f);
-
- /**
- * Frees callback struct.
- * @param callback pointer to callback struct
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_callback_t *callback,
- const axis2_env_t *env);
- };
-
- /**
- * callback struct.
- */
- struct axis2_callback
- {
- /** operations of callback. */
- axis2_callback_ops_t *ops;
- };
+ AXIS2_EXTERN void AXIS2_CALL
+ axis2_callback_set_on_complete(axis2_callback_t *callback,
+ axis2_on_complete_func_ptr f);
+
+ /**
+ * Sets the on error callback function.
+ * @param callback pointer to callback struct
+ * @param f on error callback function pointer
+ */
+ AXIS2_EXTERN void AXIS2_CALL
+ axis2_callback_set_on_error(axis2_callback_t *callback,
+ axis2_on_error_func_ptr f);
+
+ /**
+ * Frees callback struct.
+ * @param callback pointer to callback struct
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_callback_free(axis2_callback_t *callback,
+ const axis2_env_t *env);
/**
* Creates a callback struct.
@@ -268,84 +209,60 @@
* @return pointer to newly created callback struct
*/
AXIS2_EXTERN axis2_callback_t *AXIS2_CALL
- axis2_callback_create(
- const axis2_env_t *env);
+ axis2_callback_create(const axis2_env_t *env);
-/** Invokes on complete functions.
- @sa axis2_callback_ops#invoke_on_complete */
+/** Invokes on complete functions. */
#define AXIS2_CALLBACK_INVOKE_ON_COMPLETE(callback, env, result) \
- ((callback)->ops->invoke_on_complete(callback, env, result))
-
-/** Function to be called on complete of callback.
- @sa axis2_callback_ops#on_complete */
-#define AXIS2_CALLBACK_ON_COMPLETE(callback, env) \
- ((callback)->ops->on_complete(callback, env))
+ axis2_callback_invoke_on_complete(callback, env, result)
-/** Reports error.
- @sa axis2_callback_ops#report_error */
+/** Reports error. */
#define AXIS2_CALLBACK_REPORT_ERROR(callback, env, error) \
- ((callback)->ops->report_error(callback, env, error))
-
-/** Function to be called on error of callback.
- @sa axis2_callback_ops#on_error */
-#define AXIS2_CALLBACK_ON_ERROR(callback, env, error) \
- ((callback)->ops->on_error(callback, env, error))
+ axis2_callback_report_error(callback, env, error)
-/** Gets complete status.
- @sa axis2_callback_ops#get_complete */
+/** Gets complete status. */
#define AXIS2_CALLBACK_GET_COMPLETE(callback, env)\
- ((callback)->ops->get_complete(callback, env))
+ axis2_callback_get_complete(callback, env)
-/** Sets complete status.
- @sa axis2_callback_ops#set_complete */
+/** Sets complete status. */
#define AXIS2_CALLBACK_SET_COMPLETE(callback, env, complete) \
- ((callback)->ops->set_complete(callback, env, complete))
+ axis2_callback_set_complete(callback, env, complete)
-/** Gets result SOAP envelope.
- @sa axis2_callback_ops#get_envelope */
+/** Gets result SOAP envelope. */
#define AXIS2_CALLBACK_GET_ENVELOPE(callback, env) \
- ((callback)->ops->get_envelope(callback, env))
+ axis2_callback_get_envelope(callback, env)
-/** Sets SOAP envelope.
- @sa axis2_callback_ops#set_envelope */
+/** Sets SOAP envelope. */
#define AXIS2_CALLBACK_SET_ENVELOPE(callback, env, envelope) \
- ((callback)->ops->set_envelope(callback, env, envelope))
+ axis2_callback_set_envelope(callback, env, envelope)
-/** Gets error code.
- @sa axis2_callback_ops#get_error */
+/** Gets error code. */
#define AXIS2_CALLBACK_GET_ERROR(callback, env) \
- ((callback)->ops->get_error(callback, env))
+ axis2_callback_get_error(callback, env)
-/** Sets error code.
- @sa axis2_callback_ops#set_error */
+/** Sets error code. */
#define AXIS2_CALLBACK_SET_ERROR(callback, env, error) \
- ((callback)->ops->set_error(callback, env, error))
+ axis2_callback_set_error(callback, env, error)
-/** Gets data.
- @sa axis2_callback_ops#get_data */
+/** Gets data. */
#define AXIS2_CALLBACK_GET_DATA(callback) \
- ((callback)->ops->get_data(callback))
+ axis2_callback_get_data(callback)
-/** Sets data.
- @sa axis2_callback_ops#set_data */
+/** Sets data. */
#define AXIS2_CALLBACK_SET_DATA(callback, data) \
- ((callback)->ops->set_data(callback, data))
+ axis2_callback_set_data(callback, data)
-/** Sets on complete callback function.
- @sa axis2_callback_ops#set_on_complete */
+/** Sets on complete callback function. */
#define AXIS2_CALLBACK_SET_ON_COMPLETE(callback, func) \
- ((callback)->ops->set_on_complete(callback, func))
+ axis2_callback_set_on_complete(callback, func)
-/** Set on error callback function.
- @sa axis2_callback_ops#set_on_error */
+/** Set on error callback function. */
#define AXIS2_CALLBACK_SET_ON_ERROR(callback, func) \
- ((callback)->ops->set_on_error(callback, func))
+ axis2_callback_set_on_error(callback, func)
-/** Frees callback struct.
- @sa axis2_callback_ops#free */
+/** Frees callback struct. */
#define AXIS2_CALLBACK_FREE(callback, env) \
- ((callback)->ops->free (callback, env))
+ axis2_callback_free (callback, env)
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_callback_recv.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_callback_recv.h?view=diff&rev=518623&r1=518622&r2=518623
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_callback_recv.h (original)
+++ webservices/axis2/trunk/c/include/axis2_callback_recv.h Thu Mar 15 06:16:07 2007
@@ -39,70 +39,46 @@
{
#endif
-/** Callback receiver service name */
-#define AXIS2_CALLBACK_RECV_SVC_NAME "ClientService"
-
- /** Type name for struct axis2_callback_recv_ops */
- typedef struct axis2_callback_recv_ops axis2_callback_recv_ops_t;
/** Type name for struct axis2_callback_recv */
typedef struct axis2_callback_recv axis2_callback_recv_t;
/**
- * callback receiver ops struct.
- * Encapsulator struct for ops of axis2_callback_recv.
+ * Gets the base struct which is of type message receiver.
+ * @param callback_recv pointer to callback receiver struct
+ * @param env pointer to environment struct
+ * @return pointer to base message receiver struct
+ */
+ AXIS2_EXTERN axis2_msg_recv_t *AXIS2_CALL
+ axis2_callback_recv_get_base(axis2_callback_recv_t *callback_recv,
+ const axis2_env_t *env);
+
+ /**
+ * Frees the callback receiver struct.
+ * @param callback_recv pointer to callback receiver struct
+ * @param env pointer to environment struct
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_callback_recv_ops
- {
- /**
- * Gets the base struct which is of type message receiver.
- * @param callback_recv pointer to callback receiver struct
- * @param env pointer to environment struct
- * @return pointer to base message receiver struct
- */
- axis2_msg_recv_t *(AXIS2_CALL *
- get_base)(
- const axis2_callback_recv_t *callback_recv,
- const axis2_env_t *env);
-
- /**
- * Frees the callback receiver struct.
- * @param callback_recv pointer to callback receiver struct
- * @param env pointer to environment struct
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- free)(
- axis2_callback_recv_t *callback_recv,
- const axis2_env_t *env);
-
- /**
- * Adds a callback corresponding to given WSA message ID to message
- * receiver.
- * @param callback_recv pointer to callback receiver struct
- * @param env pointer to environment struct
- * @param msg_id message ID indicating which message the callback is
- * supposed to deal with
- * @param callback callback to be added. callback receiver assumes
- * ownership of the callback
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
- axis2_status_t (AXIS2_CALL *
- add_callback)(
- struct axis2_callback_recv *callback_recv,
- const axis2_env_t *env,
- const axis2_char_t *msg_id,
- axis2_callback_t *callback);
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_callback_recv_free(axis2_callback_recv_t *callback_recv,
+ const axis2_env_t *env);
/**
- * callback receiver struct.
+ * Adds a callback corresponding to given WSA message ID to message
+ * receiver.
+ * @param callback_recv pointer to callback receiver struct
+ * @param env pointer to environment struct
+ * @param msg_id message ID indicating which message the callback is
+ * supposed to deal with
+ * @param callback callback to be added. callback receiver assumes
+ * ownership of the callback
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
- struct axis2_callback_recv
- {
- /** operations of callback receiver */
- axis2_callback_recv_ops_t *ops;
- };
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ axis2_callback_recv_add_callback(struct axis2_callback_recv *callback_recv,
+ const axis2_env_t *env,
+ const axis2_char_t *msg_id,
+ axis2_callback_t *callback);
/**
* Creates a callback receiver struct.
@@ -111,23 +87,19 @@
* or NULL on error with error code set in environment's error
*/
AXIS2_EXTERN axis2_callback_recv_t *AXIS2_CALL
- axis2_callback_recv_create(
- const axis2_env_t *env);
+ axis2_callback_recv_create(const axis2_env_t *env);
-/** Gets the base message receiver.
- @sa axis2_callback_recv_ops#get_base */
+/** Gets the base message receiver. */
#define AXIS2_CALLBACK_RECV_GET_BASE(callback_recv, env) \
- ((callback_recv)->ops->get_base(callback_recv, env))
+ axis2_callback_recv_get_base(callback_recv, env)
-/** Frees callback message receiver.
- @sa axis2_callback_recv_ops#free */
+/** Frees callback message receiver. */
#define AXIS2_CALLBACK_RECV_FREE(callback_recv, env) \
- ((callback_recv)->ops->free(callback_recv, env))
+ axis2_callback_recv_free(callback_recv, env)
-/** Adds callback to callback message receiver.
- @sa axis2_callback_recv_ops#free */
+/** Adds callback to callback message receiver. */
#define AXIS2_CALLBACK_RECV_ADD_CALLBACK(callback_recv, env, msg_id, callback)\
- ((callback_recv)->ops->add_callback(callback_recv, env, msg_id, callback))
+ axis2_callback_recv_add_callback(callback_recv, env, msg_id, callback)
/** @} */
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org