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 na...@apache.org on 2006/03/24 05:48:18 UTC
svn commit: r388367 [1/2] - in /webservices/axis2/trunk/c: include/
modules/core/addr/ modules/core/clientapi/ modules/xml/parser/libxml2/
samples/client/math/
Author: nandika
Date: Thu Mar 23 20:48:17 2006
New Revision: 388367
URL: http://svn.apache.org/viewcvs?rev=388367&view=rev
Log:
code formatted according to standards and bugs memory leaks fixed
Modified:
webservices/axis2/trunk/c/include/axis2_xml_reader.h
webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
webservices/axis2/trunk/c/modules/core/addr/relates_to.c
webservices/axis2/trunk/c/modules/core/addr/svc_name.c
webservices/axis2/trunk/c/modules/core/clientapi/async_result.c
webservices/axis2/trunk/c/modules/core/clientapi/axis2_msg_sender.h
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/callback_recv.h
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.c
webservices/axis2/trunk/c/modules/core/clientapi/listener_manager.h
webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c
webservices/axis2/trunk/c/samples/client/math/math_client.c
Modified: webservices/axis2/trunk/c/include/axis2_xml_reader.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_xml_reader.h?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_xml_reader.h (original)
+++ webservices/axis2/trunk/c/include/axis2_xml_reader.h Thu Mar 23 20:48:17 2006
@@ -269,6 +269,13 @@
xml_free)(axis2_xml_reader_t *parser,
axis2_env_t **env,
void *data);
+
+ /**
+ * get the char set encoding of the parser
+ * @param parser xml parser
+ * @param env environment
+ * @returns char set encoding string or NULL in failure
+ */
axis2_char_t* (AXIS2_CALL *
get_char_set_encoding)(axis2_xml_reader_t *parser,
@@ -319,6 +326,20 @@
int (*close_input_callback)(void *ctx),
void *ctx,
const axis2_char_t *encoding);
+
+/**
+ * create an axis2_xml_reader_t using a buffer, which is the xml input
+ * @param env environment, MUST not be NULL
+ * @param buffer xml input string in a char buffer
+ * @param size size of the @buffer
+ * @param encoding encoding of the xml
+ * @return pointer to axis2_xml_reader_t struct on success , NULL otherwise
+ */
+AXIS2_DECLARE(axis2_xml_reader_t *)
+axis2_xml_reader_create_for_buffer(axis2_env_t **env,
+ const axis2_char_t *buffer,
+ int size,
+ const axis2_char_t *encoding);
/********************************* Macros *************************************/
Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Thu Mar 23 20:48:17 2006
@@ -41,48 +41,94 @@
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(endpoint_ref) ((axis2_endpoint_ref_impl_t *)endpoint_ref)
-axis2_char_t* AXIS2_CALL axis2_endpoint_ref_get_address(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_address(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_char_t *address);
-axis2_qname_t* AXIS2_CALL axis2_endpoint_ref_get_interface_qname(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_interface_qname(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_qname_t *interface_qname);
-axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_ref_properties(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_ref_properties(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_any_content_type_t *ref_properties);
-axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_ref_params(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_ref_params(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env,
- axis2_any_content_type_t* any_content_type);
-axis2_svc_name_t* AXIS2_CALL axis2_endpoint_ref_get_svc_name(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_svc_name(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_svc_name_t *svc_name);
-axis2_om_node_t* AXIS2_CALL axis2_endpoint_ref_get_policies(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_policies(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_om_node_t *policies);
-axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_metadata(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_metadata(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_any_content_type_t *metadata);
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_add_ref_param(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_qname_t *qname, axis2_char_t *value);
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_free (struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env);
-axis2_endpoint_ref_t* AXIS2_CALL axis2_endpoint_ref_create(axis2_env_t **env, axis2_char_t *address)
+axis2_char_t* AXIS2_CALL
+axis2_endpoint_ref_get_address(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_address(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_char_t *address);
+
+axis2_qname_t* AXIS2_CALL
+axis2_endpoint_ref_get_interface_qname(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_interface_qname(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_qname_t *interface_qname);
+
+axis2_any_content_type_t* AXIS2_CALL
+axis2_endpoint_ref_get_ref_properties(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_ref_properties(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_any_content_type_t *ref_properties);
+
+
+axis2_any_content_type_t* AXIS2_CALL
+axis2_endpoint_ref_get_ref_params(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_ref_params(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_any_content_type_t* any_content_type);
+
+axis2_svc_name_t* AXIS2_CALL
+axis2_endpoint_ref_get_svc_name(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_svc_name(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_svc_name_t *svc_name);
+
+axis2_om_node_t* AXIS2_CALL
+axis2_endpoint_ref_get_policies(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_policies(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_om_node_t *policies);
+
+axis2_any_content_type_t* AXIS2_CALL
+axis2_endpoint_ref_get_metadata(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_metadata(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_any_content_type_t *metadata);
+
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_add_ref_param(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_qname_t *qname,
+ axis2_char_t *value);
+
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_free (struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env);
+
+
+
+axis2_endpoint_ref_t* AXIS2_CALL
+axis2_endpoint_ref_create(axis2_env_t **env,
+ axis2_char_t *address)
{
axis2_endpoint_ref_impl_t *endpoint_ref_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- endpoint_ref_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_endpoint_ref_impl_t) );
+ endpoint_ref_impl = AXIS2_MALLOC( (*env)->allocator,
+ sizeof(axis2_endpoint_ref_impl_t) );
if (!endpoint_ref_impl)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -110,7 +156,8 @@
}
/* initialize ops */
- endpoint_ref_impl->endpoint_ref.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_endpoint_ref_ops_t) );
+ endpoint_ref_impl->endpoint_ref.ops =
+ AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_endpoint_ref_ops_t) );
if (!endpoint_ref_impl->endpoint_ref.ops)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -118,22 +165,54 @@
return NULL;
}
- endpoint_ref_impl->endpoint_ref.ops->get_address = axis2_endpoint_ref_get_address;
- endpoint_ref_impl->endpoint_ref.ops->set_address = axis2_endpoint_ref_set_address;
- endpoint_ref_impl->endpoint_ref.ops->get_interface_qname = axis2_endpoint_ref_get_interface_qname;
- endpoint_ref_impl->endpoint_ref.ops->set_interface_qname = axis2_endpoint_ref_set_interface_qname;
- endpoint_ref_impl->endpoint_ref.ops->get_ref_properties = axis2_endpoint_ref_get_ref_properties;
- endpoint_ref_impl->endpoint_ref.ops->set_ref_properties = axis2_endpoint_ref_set_ref_properties;
- endpoint_ref_impl->endpoint_ref.ops->get_ref_params = axis2_endpoint_ref_get_ref_params;
- endpoint_ref_impl->endpoint_ref.ops->set_ref_params = axis2_endpoint_ref_set_ref_params;
- endpoint_ref_impl->endpoint_ref.ops->get_svc_name = axis2_endpoint_ref_get_svc_name;
- endpoint_ref_impl->endpoint_ref.ops->set_svc_name = axis2_endpoint_ref_set_svc_name;
- endpoint_ref_impl->endpoint_ref.ops->get_policies = axis2_endpoint_ref_get_policies;
- endpoint_ref_impl->endpoint_ref.ops->set_policies = axis2_endpoint_ref_set_policies;
- endpoint_ref_impl->endpoint_ref.ops->get_metadata = axis2_endpoint_ref_get_metadata;
- endpoint_ref_impl->endpoint_ref.ops->set_metadata = axis2_endpoint_ref_set_metadata;
- endpoint_ref_impl->endpoint_ref.ops->add_ref_param = axis2_endpoint_ref_add_ref_param;
- endpoint_ref_impl->endpoint_ref.ops->free = axis2_endpoint_ref_free;
+ endpoint_ref_impl->endpoint_ref.ops->get_address =
+ axis2_endpoint_ref_get_address;
+
+ endpoint_ref_impl->endpoint_ref.ops->set_address =
+ axis2_endpoint_ref_set_address;
+
+ endpoint_ref_impl->endpoint_ref.ops->get_interface_qname =
+ axis2_endpoint_ref_get_interface_qname;
+
+ endpoint_ref_impl->endpoint_ref.ops->set_interface_qname =
+ axis2_endpoint_ref_set_interface_qname;
+
+ endpoint_ref_impl->endpoint_ref.ops->get_ref_properties =
+ axis2_endpoint_ref_get_ref_properties;
+
+ endpoint_ref_impl->endpoint_ref.ops->set_ref_properties =
+ axis2_endpoint_ref_set_ref_properties;
+
+ endpoint_ref_impl->endpoint_ref.ops->get_ref_params =
+ axis2_endpoint_ref_get_ref_params;
+
+ endpoint_ref_impl->endpoint_ref.ops->set_ref_params =
+ axis2_endpoint_ref_set_ref_params;
+
+ endpoint_ref_impl->endpoint_ref.ops->get_svc_name =
+ axis2_endpoint_ref_get_svc_name;
+
+ endpoint_ref_impl->endpoint_ref.ops->set_svc_name =
+ axis2_endpoint_ref_set_svc_name;
+
+ endpoint_ref_impl->endpoint_ref.ops->get_policies =
+ axis2_endpoint_ref_get_policies;
+
+ endpoint_ref_impl->endpoint_ref.ops->set_policies =
+ axis2_endpoint_ref_set_policies;
+
+ endpoint_ref_impl->endpoint_ref.ops->get_metadata =
+ axis2_endpoint_ref_get_metadata;
+
+ endpoint_ref_impl->endpoint_ref.ops->set_metadata =
+ axis2_endpoint_ref_set_metadata;
+
+ endpoint_ref_impl->endpoint_ref.ops->add_ref_param =
+ axis2_endpoint_ref_add_ref_param;
+
+ endpoint_ref_impl->endpoint_ref.ops->free =
+ axis2_endpoint_ref_free;
+
return &(endpoint_ref_impl->endpoint_ref);
}
@@ -142,8 +221,9 @@
/**
* Method get_address
*/
-axis2_char_t* AXIS2_CALL axis2_endpoint_ref_get_address(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env)
+axis2_char_t* AXIS2_CALL
+axis2_endpoint_ref_get_address(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(endpoint_ref)->address;
@@ -154,8 +234,10 @@
*
* @param address
*/
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_address(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_char_t *address)
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_address(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_char_t *address)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(endpoint_ref)->address)
@@ -171,8 +253,9 @@
/**
* Method get_interface_qname
*/
-axis2_qname_t* AXIS2_CALL axis2_endpoint_ref_get_interface_qname(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env)
+axis2_qname_t* AXIS2_CALL
+axis2_endpoint_ref_get_interface_qname(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(endpoint_ref)->interface_qname;
@@ -183,8 +266,10 @@
*
* @param interface_qname
*/
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_interface_qname(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_qname_t *interface_qname)
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_interface_qname(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_qname_t *interface_qname)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(endpoint_ref)->interface_qname = interface_qname;
@@ -194,8 +279,9 @@
/**
* Method get_ref_properties
*/
-axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_ref_properties(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env)
+axis2_any_content_type_t* AXIS2_CALL
+axis2_endpoint_ref_get_ref_properties(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_properties;
@@ -206,8 +292,10 @@
*
* @param ref_properties
*/
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_ref_properties(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_any_content_type_t *ref_properties)
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_ref_properties(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_any_content_type_t *ref_properties)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_properties = ref_properties;
@@ -217,16 +305,18 @@
/**
* Method get_ref_params
*/
-axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_ref_params(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env)
+axis2_any_content_type_t* AXIS2_CALL
+axis2_endpoint_ref_get_ref_params(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_params;
}
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_ref_params(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env,
- axis2_any_content_type_t* any_content_type)
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_ref_params(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_any_content_type_t* any_content_type)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(endpoint_ref)->ref_params = any_content_type;
@@ -236,8 +326,9 @@
/**
* Method get_svc_name
*/
-axis2_svc_name_t* AXIS2_CALL axis2_endpoint_ref_get_svc_name(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env)
+axis2_svc_name_t* AXIS2_CALL
+axis2_endpoint_ref_get_svc_name(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(endpoint_ref)->svc_name;
@@ -248,46 +339,57 @@
*
* @param svc_name
*/
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_svc_name(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_svc_name_t *svc_name)
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_svc_name(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_svc_name_t *svc_name)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(endpoint_ref)->svc_name = svc_name;
return AXIS2_SUCCESS;
}
-axis2_om_node_t* AXIS2_CALL axis2_endpoint_ref_get_policies(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env)
+axis2_om_node_t* AXIS2_CALL
+axis2_endpoint_ref_get_policies(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(endpoint_ref)->policies;
}
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_policies(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_om_node_t *policies)
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_policies(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_om_node_t *policies)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(endpoint_ref)->policies = policies;
return AXIS2_SUCCESS;
}
-axis2_any_content_type_t* AXIS2_CALL axis2_endpoint_ref_get_metadata(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env)
+axis2_any_content_type_t* AXIS2_CALL
+axis2_endpoint_ref_get_metadata(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(endpoint_ref)->metadata;
}
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_set_metadata(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_any_content_type_t *metadata)
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_set_metadata(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_any_content_type_t *metadata)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(endpoint_ref)->metadata = metadata;
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_add_ref_param(struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env, axis2_qname_t *qname, axis2_char_t *value)
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_add_ref_param(struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env,
+ axis2_qname_t *qname,
+ axis2_char_t *value)
{
axis2_endpoint_ref_impl_t *endpoint_ref_impl = NULL;
@@ -305,8 +407,9 @@
return AXIS2_ANY_CONTENT_TYPE_ADD_VALUE(endpoint_ref_impl->ref_params, env, qname, value);
}
-axis2_status_t AXIS2_CALL axis2_endpoint_ref_free (struct axis2_endpoint_ref *endpoint_ref,
- axis2_env_t **env)
+axis2_status_t AXIS2_CALL
+axis2_endpoint_ref_free (struct axis2_endpoint_ref *endpoint_ref,
+ axis2_env_t **env)
{
axis2_endpoint_ref_impl_t *endpoint_ref_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Thu Mar 23 20:48:17 2006
@@ -43,40 +43,83 @@
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(msg_info_headers) ((axis2_msg_info_headers_impl_t *)msg_info_headers)
-axis2_endpoint_ref_t* AXIS2_CALL axis2_msg_info_headers_get_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_endpoint_ref_t *to);
-axis2_endpoint_ref_t* AXIS2_CALL axis2_msg_info_headers_get_from(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_from(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_endpoint_ref_t *from);
-axis2_endpoint_ref_t* AXIS2_CALL axis2_msg_info_headers_get_reply_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_reply_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_endpoint_ref_t *reply_to);
-axis2_endpoint_ref_t* AXIS2_CALL axis2_msg_info_headers_get_fault_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_fault_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_endpoint_ref_t *fault_to);
-axis2_char_t* AXIS2_CALL axis2_msg_info_headers_get_action(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_action(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_char_t *action);
-axis2_char_t* AXIS2_CALL axis2_msg_info_headers_get_message_id(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_message_id(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_char_t *message_id);
-axis2_relates_to_t* AXIS2_CALL axis2_msg_info_headers_get_relates_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_relates_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_relates_to_t *relates_to);
-axis2_array_list_t* AXIS2_CALL axis2_msg_info_headers_get_ref_params(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_add_ref_param(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_om_node_t *ref_param);
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_free(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env);
+
+axis2_endpoint_ref_t* AXIS2_CALL
+axis2_msg_info_headers_get_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_endpoint_ref_t *to);
+
+axis2_endpoint_ref_t* AXIS2_CALL
+axis2_msg_info_headers_get_from(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_from(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_endpoint_ref_t *from);
+
+axis2_endpoint_ref_t* AXIS2_CALL
+axis2_msg_info_headers_get_reply_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_reply_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_endpoint_ref_t *reply_to);
+
+axis2_endpoint_ref_t* AXIS2_CALL
+axis2_msg_info_headers_get_fault_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_fault_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_endpoint_ref_t *fault_to);
+
+axis2_char_t* AXIS2_CALL
+axis2_msg_info_headers_get_action(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_action(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_char_t *action);
+
+axis2_char_t* AXIS2_CALL
+axis2_msg_info_headers_get_message_id(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_message_id(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_char_t *message_id);
+
+axis2_relates_to_t* AXIS2_CALL
+axis2_msg_info_headers_get_relates_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_relates_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_relates_to_t *relates_to);
+
+axis2_array_list_t* AXIS2_CALL
+axis2_msg_info_headers_get_ref_params(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_add_ref_param(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_om_node_t *ref_param);
+
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_free(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env);
+
/**
@@ -85,14 +128,17 @@
* @param wsaTo
* @param action
*/
-axis2_msg_info_headers_t* AXIS2_CALL axis2_msg_info_headers_create(axis2_env_t **env, axis2_endpoint_ref_t *to,
- axis2_char_t *action)
+axis2_msg_info_headers_t* AXIS2_CALL
+axis2_msg_info_headers_create(axis2_env_t **env, axis2_endpoint_ref_t *to,
+ axis2_char_t *action)
{
axis2_msg_info_headers_impl_t *msg_info_headers_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- msg_info_headers_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_msg_info_headers_impl_t) );
+ msg_info_headers_impl =
+ AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_msg_info_headers_impl_t) );
+
if (!msg_info_headers_impl)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -126,7 +172,9 @@
}
/* initialize ops */
- msg_info_headers_impl->msg_info_headers.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_msg_info_headers_ops_t) );
+ msg_info_headers_impl->msg_info_headers.ops =
+ AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_msg_info_headers_ops_t) );
+
if (!msg_info_headers_impl->msg_info_headers.ops)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -134,23 +182,56 @@
return NULL;
}
- msg_info_headers_impl->msg_info_headers.ops->get_to = axis2_msg_info_headers_get_to;
- msg_info_headers_impl->msg_info_headers.ops->set_to = axis2_msg_info_headers_set_to;
- msg_info_headers_impl->msg_info_headers.ops->get_from = axis2_msg_info_headers_get_from;
- msg_info_headers_impl->msg_info_headers.ops->set_from = axis2_msg_info_headers_set_from;
- msg_info_headers_impl->msg_info_headers.ops->get_reply_to = axis2_msg_info_headers_get_reply_to;
- msg_info_headers_impl->msg_info_headers.ops->set_reply_to = axis2_msg_info_headers_set_reply_to;
- msg_info_headers_impl->msg_info_headers.ops->get_fault_to = axis2_msg_info_headers_get_fault_to;
- msg_info_headers_impl->msg_info_headers.ops->set_fault_to = axis2_msg_info_headers_set_fault_to;
- msg_info_headers_impl->msg_info_headers.ops->get_action = axis2_msg_info_headers_get_action;
- msg_info_headers_impl->msg_info_headers.ops->set_action = axis2_msg_info_headers_set_action;
- msg_info_headers_impl->msg_info_headers.ops->get_message_id = axis2_msg_info_headers_get_message_id;
- msg_info_headers_impl->msg_info_headers.ops->set_message_id = axis2_msg_info_headers_set_message_id;
- msg_info_headers_impl->msg_info_headers.ops->get_relates_to = axis2_msg_info_headers_get_relates_to;
- msg_info_headers_impl->msg_info_headers.ops->set_relates_to = axis2_msg_info_headers_set_relates_to;
- msg_info_headers_impl->msg_info_headers.ops->get_ref_params = axis2_msg_info_headers_get_ref_params;
- msg_info_headers_impl->msg_info_headers.ops->add_ref_param = axis2_msg_info_headers_add_ref_param;
- msg_info_headers_impl->msg_info_headers.ops->free = axis2_msg_info_headers_free;
+ msg_info_headers_impl->msg_info_headers.ops->get_to =
+ axis2_msg_info_headers_get_to;
+
+ msg_info_headers_impl->msg_info_headers.ops->set_to =
+ axis2_msg_info_headers_set_to;
+
+ msg_info_headers_impl->msg_info_headers.ops->get_from =
+ axis2_msg_info_headers_get_from;
+
+ msg_info_headers_impl->msg_info_headers.ops->set_from =
+ axis2_msg_info_headers_set_from;
+
+ msg_info_headers_impl->msg_info_headers.ops->get_reply_to =
+ axis2_msg_info_headers_get_reply_to;
+
+ msg_info_headers_impl->msg_info_headers.ops->set_reply_to =
+ axis2_msg_info_headers_set_reply_to;
+
+ msg_info_headers_impl->msg_info_headers.ops->get_fault_to =
+ axis2_msg_info_headers_get_fault_to;
+
+ msg_info_headers_impl->msg_info_headers.ops->set_fault_to =
+ axis2_msg_info_headers_set_fault_to;
+
+ msg_info_headers_impl->msg_info_headers.ops->get_action =
+ axis2_msg_info_headers_get_action;
+
+ msg_info_headers_impl->msg_info_headers.ops->set_action =
+ axis2_msg_info_headers_set_action;
+
+ msg_info_headers_impl->msg_info_headers.ops->get_message_id =
+ axis2_msg_info_headers_get_message_id;
+
+ msg_info_headers_impl->msg_info_headers.ops->set_message_id =
+ axis2_msg_info_headers_set_message_id;
+
+ msg_info_headers_impl->msg_info_headers.ops->get_relates_to =
+ axis2_msg_info_headers_get_relates_to;
+
+ msg_info_headers_impl->msg_info_headers.ops->set_relates_to =
+ axis2_msg_info_headers_set_relates_to;
+
+ msg_info_headers_impl->msg_info_headers.ops->get_ref_params =
+ axis2_msg_info_headers_get_ref_params;
+
+ msg_info_headers_impl->msg_info_headers.ops->add_ref_param =
+ axis2_msg_info_headers_add_ref_param;
+
+ msg_info_headers_impl->msg_info_headers.ops->free =
+ axis2_msg_info_headers_free;
return &(msg_info_headers_impl->msg_info_headers);
}
@@ -160,8 +241,9 @@
*
* @return
*/
-axis2_endpoint_ref_t* AXIS2_CALL axis2_msg_info_headers_get_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env)
+axis2_endpoint_ref_t* AXIS2_CALL
+axis2_msg_info_headers_get_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(msg_info_headers)->to;
@@ -172,8 +254,10 @@
*
* @param to
*/
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_endpoint_ref_t *to)
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_endpoint_ref_t *to)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(msg_info_headers)->to = to;
@@ -185,8 +269,9 @@
*
* @return
*/
-axis2_endpoint_ref_t* AXIS2_CALL axis2_msg_info_headers_get_from(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env)
+axis2_endpoint_ref_t* AXIS2_CALL
+axis2_msg_info_headers_get_from(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(msg_info_headers)->from;
@@ -197,8 +282,10 @@
*
* @param from
*/
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_from(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_endpoint_ref_t *from)
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_from(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_endpoint_ref_t *from)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(msg_info_headers)->from = from;
@@ -210,8 +297,9 @@
*
* @return
*/
-axis2_endpoint_ref_t* AXIS2_CALL axis2_msg_info_headers_get_reply_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env)
+axis2_endpoint_ref_t* AXIS2_CALL
+axis2_msg_info_headers_get_reply_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(msg_info_headers)->reply_to;
@@ -222,8 +310,10 @@
*
* @param reply_to
*/
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_reply_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_endpoint_ref_t *reply_to)
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_reply_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_endpoint_ref_t *reply_to)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(msg_info_headers)->reply_to = reply_to;
@@ -235,8 +325,9 @@
*
* @return
*/
-axis2_endpoint_ref_t* AXIS2_CALL axis2_msg_info_headers_get_fault_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env)
+axis2_endpoint_ref_t* AXIS2_CALL
+axis2_msg_info_headers_get_fault_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(msg_info_headers)->fault_to;
@@ -247,8 +338,10 @@
*
* @param fault_to
*/
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_fault_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_endpoint_ref_t *fault_to)
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_fault_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_endpoint_ref_t *fault_to)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(msg_info_headers)->fault_to = fault_to;
@@ -260,8 +353,9 @@
*
* @return
*/
-axis2_char_t* AXIS2_CALL axis2_msg_info_headers_get_action(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env)
+axis2_char_t* AXIS2_CALL
+axis2_msg_info_headers_get_action(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(msg_info_headers)->action;
@@ -272,8 +366,10 @@
*
* @param action
*/
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_action(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_char_t *action)
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_action(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_char_t *action)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if(NULL != AXIS2_INTF_TO_IMPL(msg_info_headers)->action)
@@ -295,8 +391,9 @@
*
* @return
*/
-axis2_char_t* AXIS2_CALL axis2_msg_info_headers_get_message_id(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env)
+axis2_char_t* AXIS2_CALL
+axis2_msg_info_headers_get_message_id(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(msg_info_headers)->message_id;
@@ -307,8 +404,10 @@
*
* @param message_id
*/
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_message_id(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_char_t *message_id)
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_message_id(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_char_t *message_id)
{
axis2_msg_info_headers_impl_t *msg_info_headers_impl = NULL;
@@ -340,8 +439,9 @@
*
* @return
*/
-axis2_relates_to_t* AXIS2_CALL axis2_msg_info_headers_get_relates_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env)
+axis2_relates_to_t* AXIS2_CALL
+axis2_msg_info_headers_get_relates_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(msg_info_headers)->relates_to;
@@ -352,23 +452,28 @@
*
* @param relates_to
*/
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_set_relates_to(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_relates_to_t *relates_to)
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_set_relates_to(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_relates_to_t *relates_to)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(msg_info_headers)->relates_to = relates_to;
return AXIS2_SUCCESS;
}
-axis2_array_list_t* AXIS2_CALL axis2_msg_info_headers_get_ref_params(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env)
+axis2_array_list_t* AXIS2_CALL
+axis2_msg_info_headers_get_ref_params(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(msg_info_headers)->ref_params;
}
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_add_ref_param(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env, axis2_om_node_t *ref_param)
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_add_ref_param(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env,
+ axis2_om_node_t *ref_param)
{
axis2_msg_info_headers_impl_t *msg_info_headers_impl = NULL;
@@ -391,8 +496,9 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL axis2_msg_info_headers_free(struct axis2_msg_info_headers *msg_info_headers,
- axis2_env_t **env)
+axis2_status_t AXIS2_CALL
+axis2_msg_info_headers_free(struct axis2_msg_info_headers *msg_info_headers,
+ axis2_env_t **env)
{
axis2_msg_info_headers_impl_t *msg_info_headers_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/addr/relates_to.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/addr/relates_to.c?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/relates_to.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/relates_to.c Thu Mar 23 20:48:17 2006
@@ -31,14 +31,33 @@
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(relates_to) ((axis2_relates_to_impl_t *)relates_to)
-axis2_char_t* AXIS2_CALL axis2_relates_to_get_value(struct axis2_relates_to *relates_to, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_relates_to_set_value(struct axis2_relates_to *relates_to, axis2_env_t **env, axis2_char_t * value);
-axis2_char_t* AXIS2_CALL axis2_relates_to_get_relationship_type(struct axis2_relates_to *relates_to, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_relates_to_set_relationship_type(struct axis2_relates_to *relates_to, axis2_env_t **env, axis2_char_t *relationship_type);
-axis2_status_t AXIS2_CALL axis2_relates_to_free (struct axis2_relates_to *relates_to,
- axis2_env_t **env);
-axis2_relates_to_t* AXIS2_CALL axis2_relates_to_create(axis2_env_t **env, axis2_char_t *value, axis2_char_t *relationship_type)
+axis2_char_t* AXIS2_CALL
+axis2_relates_to_get_value(struct axis2_relates_to *relates_to,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_relates_to_set_value(struct axis2_relates_to *relates_to,
+ axis2_env_t **env,
+ axis2_char_t * value);
+
+axis2_char_t* AXIS2_CALL
+axis2_relates_to_get_relationship_type(struct axis2_relates_to *relates_to,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_relates_to_set_relationship_type(struct axis2_relates_to *relates_to,
+ axis2_env_t **env,
+ axis2_char_t *relationship_type);
+
+axis2_status_t AXIS2_CALL
+axis2_relates_to_free (struct axis2_relates_to *relates_to,
+ axis2_env_t **env);
+
+axis2_relates_to_t* AXIS2_CALL
+axis2_relates_to_create(axis2_env_t **env,
+ axis2_char_t *value,
+ axis2_char_t *relationship_type)
{
axis2_relates_to_impl_t *relates_to_impl = NULL;
@@ -86,22 +105,36 @@
return NULL;
}
- relates_to_impl->relates_to.ops->get_value = axis2_relates_to_get_value;
- relates_to_impl->relates_to.ops->set_value = axis2_relates_to_set_value;
- relates_to_impl->relates_to.ops->get_relationship_type = axis2_relates_to_get_relationship_type;
- relates_to_impl->relates_to.ops->set_relationship_type = axis2_relates_to_set_relationship_type;
- relates_to_impl->relates_to.ops->free = axis2_relates_to_free;
+ relates_to_impl->relates_to.ops->get_value =
+ axis2_relates_to_get_value;
+
+ relates_to_impl->relates_to.ops->set_value =
+ axis2_relates_to_set_value;
+
+ relates_to_impl->relates_to.ops->get_relationship_type =
+ axis2_relates_to_get_relationship_type;
+
+ relates_to_impl->relates_to.ops->set_relationship_type =
+ axis2_relates_to_set_relationship_type;
+
+ relates_to_impl->relates_to.ops->free =
+ axis2_relates_to_free;
return &(relates_to_impl->relates_to);
}
-axis2_char_t* AXIS2_CALL axis2_relates_to_get_value(struct axis2_relates_to *relates_to, axis2_env_t **env)
+axis2_char_t* AXIS2_CALL
+axis2_relates_to_get_value(struct axis2_relates_to *relates_to,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(relates_to)->value;
}
-axis2_status_t AXIS2_CALL axis2_relates_to_set_value(struct axis2_relates_to *relates_to, axis2_env_t **env, axis2_char_t * value)
+axis2_status_t AXIS2_CALL
+axis2_relates_to_set_value(struct axis2_relates_to *relates_to,
+ axis2_env_t **env,
+ axis2_char_t * value)
{
axis2_relates_to_impl_t *relates_to_impl = NULL;
@@ -128,13 +161,18 @@
return AXIS2_SUCCESS;
}
-axis2_char_t* AXIS2_CALL axis2_relates_to_get_relationship_type(struct axis2_relates_to *relates_to, axis2_env_t **env)
+axis2_char_t* AXIS2_CALL
+axis2_relates_to_get_relationship_type(struct axis2_relates_to *relates_to,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(relates_to)->relationship_type;
}
-axis2_status_t AXIS2_CALL axis2_relates_to_set_relationship_type(struct axis2_relates_to *relates_to, axis2_env_t **env, axis2_char_t *relationship_type)
+axis2_status_t AXIS2_CALL
+axis2_relates_to_set_relationship_type(struct axis2_relates_to *relates_to,
+ axis2_env_t **env,
+ axis2_char_t *relationship_type)
{
axis2_relates_to_impl_t *relates_to_impl = NULL;
@@ -150,7 +188,8 @@
if (relationship_type)
{
- relates_to_impl->relationship_type = (axis2_char_t*)AXIS2_STRDUP(relationship_type, env);
+ relates_to_impl->relationship_type =
+ (axis2_char_t*)AXIS2_STRDUP(relationship_type, env);
if (!(relates_to_impl->relationship_type))
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -161,8 +200,9 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL axis2_relates_to_free (struct axis2_relates_to *relates_to,
- axis2_env_t **env)
+axis2_status_t AXIS2_CALL
+axis2_relates_to_free (struct axis2_relates_to *relates_to,
+ axis2_env_t **env)
{
axis2_relates_to_impl_t *relates_to_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/addr/svc_name.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/addr/svc_name.c?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/svc_name.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/svc_name.c Thu Mar 23 20:48:17 2006
@@ -31,24 +31,41 @@
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(svc_name) ((axis2_svc_name_impl_t *)svc_name)
-axis2_qname_t* AXIS2_CALL axis2_svc_name_get_qname(struct axis2_svc_name *svc_name,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_svc_name_set_qname(struct axis2_svc_name *svc_name,
- axis2_env_t **env, axis2_qname_t *qname);
-axis2_char_t* AXIS2_CALL axis2_svc_name_get_endpoint_name(struct axis2_svc_name *svc_name,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_svc_name_set_endpoint_name(struct axis2_svc_name *svc_name,
- axis2_env_t **env, axis2_char_t *endpoint_name);
-axis2_status_t AXIS2_CALL axis2_svc_name_free(struct axis2_svc_name *svc_name,
- axis2_env_t **env);
-axis2_svc_name_t* AXIS2_CALL axis2_svc_name_create(axis2_env_t **env, axis2_qname_t *qname, axis2_char_t *endpoint_name)
+axis2_qname_t* AXIS2_CALL
+axis2_svc_name_get_qname(struct axis2_svc_name *svc_name,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_svc_name_set_qname(struct axis2_svc_name *svc_name,
+ axis2_env_t **env,
+ axis2_qname_t *qname);
+
+axis2_char_t* AXIS2_CALL
+axis2_svc_name_get_endpoint_name(struct axis2_svc_name *svc_name,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_svc_name_set_endpoint_name(struct axis2_svc_name *svc_name,
+ axis2_env_t **env,
+ axis2_char_t *endpoint_name);
+
+axis2_status_t AXIS2_CALL
+axis2_svc_name_free(struct axis2_svc_name *svc_name,
+ axis2_env_t **env);
+
+
+axis2_svc_name_t* AXIS2_CALL
+axis2_svc_name_create(axis2_env_t **env,
+ axis2_qname_t *qname,
+ axis2_char_t *endpoint_name)
{
axis2_svc_name_impl_t *svc_name_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- svc_name_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_svc_name_impl_t) );
+ svc_name_impl =
+ AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_svc_name_impl_t) );
if (!svc_name_impl)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -82,7 +99,8 @@
}
/* initialize ops */
- svc_name_impl->svc_name.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_svc_name_ops_t) );
+ svc_name_impl->svc_name.ops =
+ AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_svc_name_ops_t) );
if (!svc_name_impl->svc_name.ops)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -104,8 +122,9 @@
*
* @return
*/
-axis2_qname_t* AXIS2_CALL axis2_svc_name_get_qname(struct axis2_svc_name *svc_name,
- axis2_env_t **env)
+axis2_qname_t* AXIS2_CALL
+axis2_svc_name_get_qname(struct axis2_svc_name *svc_name,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(svc_name)->qname;
@@ -116,8 +135,10 @@
*
* @param qname
*/
-axis2_status_t AXIS2_CALL axis2_svc_name_set_qname(struct axis2_svc_name *svc_name,
- axis2_env_t **env, axis2_qname_t *qname)
+axis2_status_t AXIS2_CALL
+axis2_svc_name_set_qname(struct axis2_svc_name *svc_name,
+ axis2_env_t **env,
+ axis2_qname_t *qname)
{
axis2_svc_name_impl_t *svc_name_impl = NULL;
@@ -146,8 +167,9 @@
*
* @return
*/
-axis2_char_t* AXIS2_CALL axis2_svc_name_get_endpoint_name(struct axis2_svc_name *svc_name,
- axis2_env_t **env)
+axis2_char_t* AXIS2_CALL
+axis2_svc_name_get_endpoint_name(struct axis2_svc_name *svc_name,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(svc_name)->endpoint_name;
@@ -158,8 +180,10 @@
*
* @param endpoint_name
*/
-axis2_status_t AXIS2_CALL axis2_svc_name_set_endpoint_name(struct axis2_svc_name *svc_name,
- axis2_env_t **env, axis2_char_t *endpoint_name)
+axis2_status_t AXIS2_CALL
+axis2_svc_name_set_endpoint_name(struct axis2_svc_name *svc_name,
+ axis2_env_t **env,
+ axis2_char_t *endpoint_name)
{
axis2_svc_name_impl_t *svc_name_impl = NULL;
@@ -183,8 +207,9 @@
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL axis2_svc_name_free (struct axis2_svc_name *svc_name,
- axis2_env_t **env)
+axis2_status_t AXIS2_CALL
+axis2_svc_name_free (struct axis2_svc_name *svc_name,
+ axis2_env_t **env)
{
axis2_svc_name_impl_t *svc_name_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/clientapi/async_result.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/async_result.c?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/async_result.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/async_result.c Thu Mar 23 20:48:17 2006
@@ -29,18 +29,29 @@
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(async_result) ((axis2_async_result_impl_t *)async_result)
-axis2_soap_envelope_t* AXIS2_CALL axis2_async_result_get_envelope(struct axis2_async_result *async_result, axis2_env_t **env);
-axis2_msg_ctx_t* AXIS2_CALL axis2_async_result_get_result(struct axis2_async_result *async_result, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_async_result_free (struct axis2_async_result *async_result,
- axis2_env_t **env);
-axis2_async_result_t* AXIS2_CALL axis2_async_result_create(axis2_env_t **env, axis2_msg_ctx_t *result)
+axis2_soap_envelope_t* AXIS2_CALL
+axis2_async_result_get_envelope(struct axis2_async_result *async_result,
+ axis2_env_t **env);
+
+axis2_msg_ctx_t* AXIS2_CALL
+axis2_async_result_get_result(struct axis2_async_result *async_result,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_async_result_free (struct axis2_async_result *async_result,
+ axis2_env_t **env);
+
+axis2_async_result_t* AXIS2_CALL
+axis2_async_result_create(axis2_env_t **env,
+ axis2_msg_ctx_t *result)
{
axis2_async_result_impl_t *async_result_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- async_result_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_async_result_impl_t) );
+ async_result_impl = AXIS2_MALLOC((*env)->allocator,
+ sizeof(axis2_async_result_impl_t) );
if (!async_result_impl)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -56,7 +67,8 @@
}
/* initialize ops */
- async_result_impl->async_result.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_async_result_ops_t) );
+ async_result_impl->async_result.ops =
+ AXIS2_MALLOC((*env)->allocator, sizeof(axis2_async_result_ops_t) );
if (!async_result_impl->async_result.ops)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -64,14 +76,21 @@
return NULL;
}
- async_result_impl->async_result.ops->get_envelope = axis2_async_result_get_envelope;
- async_result_impl->async_result.ops->get_result = axis2_async_result_get_result;
- async_result_impl->async_result.ops->free = axis2_async_result_free;
+ async_result_impl->async_result.ops->get_envelope =
+ axis2_async_result_get_envelope;
+
+ async_result_impl->async_result.ops->get_result =
+ axis2_async_result_get_result;
+
+ async_result_impl->async_result.ops->free =
+ axis2_async_result_free;
return &(async_result_impl->async_result);
}
-axis2_soap_envelope_t* AXIS2_CALL axis2_async_result_get_envelope(struct axis2_async_result *async_result, axis2_env_t **env)
+axis2_soap_envelope_t* AXIS2_CALL
+axis2_async_result_get_envelope(struct axis2_async_result *async_result,
+ axis2_env_t **env)
{
axis2_async_result_impl_t *async_result_impl = NULL;
@@ -87,14 +106,17 @@
return NULL;
}
-axis2_msg_ctx_t* AXIS2_CALL axis2_async_result_get_result(struct axis2_async_result *async_result, axis2_env_t **env)
+axis2_msg_ctx_t* AXIS2_CALL
+axis2_async_result_get_result(struct axis2_async_result *async_result,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(async_result)->result;
}
-axis2_status_t AXIS2_CALL axis2_async_result_free (struct axis2_async_result *async_result,
- axis2_env_t **env)
+axis2_status_t AXIS2_CALL
+axis2_async_result_free (struct axis2_async_result *async_result,
+ axis2_env_t **env)
{
axis2_async_result_impl_t *async_result_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/clientapi/axis2_msg_sender.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/axis2_msg_sender.h?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/axis2_msg_sender.h (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/axis2_msg_sender.h Thu Mar 23 20:48:17 2006
@@ -53,17 +53,18 @@
* @param axisop
* @param msgctx
*/
- axis2_status_t (AXIS2_CALL *send)(axis2_msg_sender_t *msg_sender,
- axis2_env_t **env,
- axis2_op_t *op,
- axis2_msg_ctx_t *msg_ctx);
+ axis2_status_t (AXIS2_CALL *
+ send)(axis2_msg_sender_t *msg_sender,
+ axis2_env_t **env,
+ axis2_op_t *op,
+ axis2_msg_ctx_t *msg_ctx);
/**
* set the transport to used for sending the SOAP Message
* @param senderTransport
*/
- axis2_status_t (AXIS2_CALL *set_transport_info)(
- axis2_msg_sender_t *msg_sender,
+ axis2_status_t (AXIS2_CALL *
+ set_transport_info)(axis2_msg_sender_t *msg_sender,
axis2_env_t **env,
axis2_char_t *sender_transport);
@@ -75,30 +76,32 @@
* @param om_node_to_send - This should be OM Element (payload)
* @return
*/
- axis2_status_t (AXIS2_CALL *send_with_om)(
- struct axis2_msg_sender *msg_sender,
- axis2_env_t **env,
- axis2_char_t *op_name,
- axis2_om_node_t *om_node_to_send);
+ axis2_status_t (AXIS2_CALL *
+ send_with_om)(struct axis2_msg_sender *msg_sender,
+ axis2_env_t **env,
+ axis2_char_t *op_name,
+ axis2_om_node_t *om_node_to_send);
/**
* Send the SOAP Message, the actual worker
*
*/
- axis2_status_t (AXIS2_CALL *send_with_soap)(
- axis2_msg_sender_t *msg_sender,
- axis2_env_t **env,
- axis2_char_t *op_name,
- axis2_soap_envelope_t *envelope);
+ axis2_status_t (AXIS2_CALL *
+ send_with_soap)(axis2_msg_sender_t *msg_sender,
+ axis2_env_t **env,
+ axis2_char_t *op_name,
+ axis2_soap_envelope_t *envelope);
/**
* Get the message information header object. All the sets to
* msg_info_headers should be done via get_msg_info and a set
*/
- axis2_msg_info_headers_t* (AXIS2_CALL *get_msg_info_headers)(
- axis2_msg_sender_t *msg_sender, axis2_env_t **env);
+ axis2_msg_info_headers_t* (AXIS2_CALL *
+ get_msg_info_headers)(axis2_msg_sender_t *msg_sender,
+ axis2_env_t **env);
- axis2_status_t (AXIS2_CALL *free)(struct axis2_msg_sender *msg_sender,
- axis2_env_t **env);
+ axis2_status_t (AXIS2_CALL *
+ free)(struct axis2_msg_sender *msg_sender,
+ axis2_env_t **env);
};
/**
@@ -110,25 +113,28 @@
axis2_msg_sender_ops_t *ops;
};
-AXIS2_DECLARE(axis2_msg_sender_t*) axis2_msg_sender_create(axis2_env_t **env,
+AXIS2_DECLARE(axis2_msg_sender_t*)
+axis2_msg_sender_create(axis2_env_t **env,
axis2_svc_ctx_t *svc_ctx);
/************************** Start of function macros **************************/
#define AXIS2_MSG_SENDER_SEND(msg_sender, env, op, msg_ctx) \
- ((msg_sender)->ops->send(msg_sender, env, \
- op, msg_ctx))
+ ((msg_sender)->ops->send(msg_sender, env, op, msg_ctx))
+
#define AXIS2_MSG_SENDER_SET_TRANSPORT_INFO(msg_sender, env, sender_transport)\
- ((msg_sender)->ops->set_transport_info(msg_sender, env,\
- sender_transport))
-#define AXIS2_MSG_SENDER_SEND_WITH_OM ((msg_sender)->ops->send_with_om(\
- msg_sender, env, op_name, om_node_to_send))
-#define AXIS2_MSG_SENDER_SEND_WITH_SOAP(msg_sender, env, op_name, \
- om_node_to_send) ((msg_sender)->ops->send_with_soap(\
- msg_sender, env, op_name, envelope))
-#define AXIS2_MSG_SENDER_FREE(msg_sender, env) ((msg_sender)->ops->free(\
- msg_sender, env))
+ ((msg_sender)->ops->set_transport_info(msg_sender, env, sender_transport))
+
+#define AXIS2_MSG_SENDER_SEND_WITH_OM(msg_sender, env, op_name, om_node_to_send) \
+ ((msg_sender)->ops->send_with_om(msg_sender, env, op_name, om_node_to_send))
+
+#define AXIS2_MSG_SENDER_SEND_WITH_SOAP(msg_sender, env, op_name, om_node_to_send) \
+ ((msg_sender)->ops->send_with_soap(msg_sender, env, op_name, envelope))
+
+#define AXIS2_MSG_SENDER_FREE(msg_sender, env) \
+ ((msg_sender)->ops->free(msg_sender, env))
+
/************************** End of function macros ****************************/
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/callback.c?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback.c Thu Mar 23 20:48:17 2006
@@ -33,23 +33,50 @@
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(callback) ((axis2_callback_impl_t *)callback)
-axis2_status_t AXIS2_CALL axis2_callback_invoke_on_complete(struct axis2_callback *callback, axis2_env_t **env, axis2_async_result_t *result);
-axis2_status_t AXIS2_CALL axis2_callback_report_error(struct axis2_callback *callback, axis2_env_t **env, int exception);
-axis2_bool_t AXIS2_CALL axis2_callback_get_complete(struct axis2_callback *callback, axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_callback_set_complete(struct axis2_callback *callback, axis2_env_t **env, axis2_bool_t complete) ;
-axis2_soap_envelope_t* AXIS2_CALL axis2_callback_get_envelope(struct axis2_callback *callback,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_callback_set_envelope(struct axis2_callback *callback,
- axis2_env_t **env, axis2_soap_envelope_t *envelope);
-int AXIS2_CALL axis2_callback_get_error(struct axis2_callback *callback,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_callback_set_error(struct axis2_callback *callback,
- axis2_env_t **env,
- int error);
-axis2_status_t AXIS2_CALL axis2_callback_free (struct axis2_callback *callback,
- axis2_env_t **env);
-axis2_callback_t* AXIS2_CALL axis2_callback_create(axis2_env_t **env)
+axis2_status_t AXIS2_CALL
+axis2_callback_invoke_on_complete(struct axis2_callback *callback,
+ axis2_env_t **env,
+ axis2_async_result_t *result);
+
+axis2_status_t AXIS2_CALL
+axis2_callback_report_error(struct axis2_callback *callback,
+ axis2_env_t **env,
+ int exception);
+
+axis2_bool_t AXIS2_CALL
+axis2_callback_get_complete(struct axis2_callback *callback,
+ axis2_env_t **env);
+axis2_status_t AXIS2_CALL
+axis2_callback_set_complete(struct axis2_callback *callback,
+ axis2_env_t **env,
+ axis2_bool_t complete);
+
+axis2_soap_envelope_t* AXIS2_CALL
+axis2_callback_get_envelope(struct axis2_callback *callback,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_callback_set_envelope(struct axis2_callback *callback,
+ axis2_env_t **env,
+ axis2_soap_envelope_t *envelope);
+
+int AXIS2_CALL
+axis2_callback_get_error(struct axis2_callback *callback,
+ axis2_env_t **env);
+axis2_status_t AXIS2_CALL
+axis2_callback_set_error(struct axis2_callback *callback,
+ axis2_env_t **env,
+ int error);
+
+axis2_status_t AXIS2_CALL
+axis2_callback_free (struct axis2_callback *callback,
+ axis2_env_t **env);
+
+
+
+axis2_callback_t* AXIS2_CALL
+axis2_callback_create(axis2_env_t **env)
{
axis2_callback_impl_t *callback_impl = NULL;
@@ -68,7 +95,9 @@
callback_impl->error = AXIS2_ERROR_NONE;
/* initialize ops */
- callback_impl->callback.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_callback_ops_t) );
+ callback_impl->callback.ops =
+ AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_callback_ops_t) );
+
if (!callback_impl->callback.ops)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -76,75 +105,110 @@
return NULL;
}
- callback_impl->callback.ops->invoke_on_complete = axis2_callback_invoke_on_complete;
- callback_impl->callback.ops->report_error = axis2_callback_report_error;
- callback_impl->callback.ops->get_complete = axis2_callback_get_complete;
- callback_impl->callback.ops->set_complete = axis2_callback_set_complete;
- callback_impl->callback.ops->get_envelope = axis2_callback_get_envelope;
- callback_impl->callback.ops->set_envelope = axis2_callback_set_envelope;
- callback_impl->callback.ops->get_error = axis2_callback_get_error;
- callback_impl->callback.ops->set_error = axis2_callback_set_error;
- callback_impl->callback.ops->free = axis2_callback_free;
+ callback_impl->callback.ops->invoke_on_complete =
+ axis2_callback_invoke_on_complete;
+
+ callback_impl->callback.ops->report_error =
+ axis2_callback_report_error;
+
+ callback_impl->callback.ops->get_complete =
+ axis2_callback_get_complete;
+
+ callback_impl->callback.ops->set_complete =
+ axis2_callback_set_complete;
+
+ callback_impl->callback.ops->get_envelope =
+ axis2_callback_get_envelope;
+
+ callback_impl->callback.ops->set_envelope =
+ axis2_callback_set_envelope;
+
+ callback_impl->callback.ops->get_error =
+ axis2_callback_get_error;
+
+ callback_impl->callback.ops->set_error =
+ axis2_callback_set_error;
+
+ callback_impl->callback.ops->free =
+ axis2_callback_free;
return &(callback_impl->callback);
}
-axis2_status_t AXIS2_CALL axis2_callback_invoke_on_complete(struct axis2_callback *callback, axis2_env_t **env, axis2_async_result_t *result)
+axis2_status_t AXIS2_CALL
+axis2_callback_invoke_on_complete(struct axis2_callback *callback,
+ axis2_env_t **env,
+ axis2_async_result_t *result)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return axis2_callback_set_envelope(callback, env, AXIS2_ASYNC_RESULT_GET_ENVELOPE(result, env));
+ return axis2_callback_set_envelope(callback, env,
+ AXIS2_ASYNC_RESULT_GET_ENVELOPE(result, env));
}
-axis2_status_t AXIS2_CALL axis2_callback_report_error(struct axis2_callback *callback, axis2_env_t **env, int exception)
+axis2_status_t AXIS2_CALL
+axis2_callback_report_error(struct axis2_callback *callback,
+ axis2_env_t **env,
+ int exception)
{
return axis2_callback_set_error(callback, env, exception);
}
-axis2_bool_t AXIS2_CALL axis2_callback_get_complete(struct axis2_callback *callback, axis2_env_t **env)
+axis2_bool_t AXIS2_CALL
+axis2_callback_get_complete(struct axis2_callback *callback,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(callback)->complete;
}
-axis2_status_t AXIS2_CALL axis2_callback_set_complete(struct axis2_callback *callback, axis2_env_t **env, axis2_bool_t complete)
+axis2_status_t AXIS2_CALL
+axis2_callback_set_complete(struct axis2_callback *callback,
+ axis2_env_t **env,
+ axis2_bool_t complete)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(callback)->complete = complete;
return AXIS2_SUCCESS;
}
-axis2_soap_envelope_t* AXIS2_CALL axis2_callback_get_envelope(struct axis2_callback *callback,
- axis2_env_t **env)
+axis2_soap_envelope_t* AXIS2_CALL
+axis2_callback_get_envelope(struct axis2_callback *callback,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(callback)->envelope;
}
-axis2_status_t AXIS2_CALL axis2_callback_set_envelope(struct axis2_callback *callback,
- axis2_env_t **env, axis2_soap_envelope_t *envelope)
+axis2_status_t AXIS2_CALL
+axis2_callback_set_envelope(struct axis2_callback *callback,
+ axis2_env_t **env,
+ axis2_soap_envelope_t *envelope)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(callback)->envelope = envelope;
return AXIS2_SUCCESS;
}
-int AXIS2_CALL axis2_callback_get_error(struct axis2_callback *callback,
- axis2_env_t **env)
+int AXIS2_CALL
+axis2_callback_get_error(struct axis2_callback *callback,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(callback)->error;
}
-axis2_status_t AXIS2_CALL axis2_callback_set_error(struct axis2_callback *callback,
- axis2_env_t **env,
- int error)
+axis2_status_t AXIS2_CALL
+axis2_callback_set_error(struct axis2_callback *callback,
+ axis2_env_t **env,
+ int error)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(callback)->error = error;
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL axis2_callback_free (struct axis2_callback *callback,
- axis2_env_t **env)
+axis2_status_t AXIS2_CALL
+axis2_callback_free (struct axis2_callback *callback,
+ axis2_env_t **env)
{
axis2_callback_impl_t *callback_impl = NULL;
Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Thu Mar 23 20:48:17 2006
@@ -37,26 +37,37 @@
/** Interface to implementation conversion macro */
#define AXIS2_INTF_TO_IMPL(callback_recv) ((axis2_callback_recv_impl_t *)callback_recv)
-axis2_msg_recv_t* AXIS2_CALL axis2_callback_recv_get_base(struct axis2_callback_recv *callback_recv,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_callback_recv_free (struct axis2_callback_recv *callback_recv,
- axis2_env_t **env);
-axis2_status_t AXIS2_CALL axis2_callback_recv_add_callback(struct axis2_callback_recv *callback_recv,
- axis2_env_t **env,
- axis2_char_t *msg_id,
- axis2_callback_t *callback);
-axis2_status_t AXIS2_CALL axis2_callback_recv_receive(axis2_msg_recv_t *msg_recv,
- axis2_env_t **env,
- axis2_msg_ctx_t *msg_ctx,
- void *callback_recv_param);
-axis2_callback_recv_t* AXIS2_CALL axis2_callback_recv_create(axis2_env_t **env)
+axis2_msg_recv_t* AXIS2_CALL
+axis2_callback_recv_get_base(struct axis2_callback_recv *callback_recv,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_callback_recv_free (struct axis2_callback_recv *callback_recv,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_callback_recv_add_callback(struct axis2_callback_recv *callback_recv,
+ axis2_env_t **env,
+ axis2_char_t *msg_id,
+ axis2_callback_t *callback);
+
+axis2_status_t AXIS2_CALL
+axis2_callback_recv_receive(axis2_msg_recv_t *msg_recv,
+ axis2_env_t **env,
+ axis2_msg_ctx_t *msg_ctx,
+ void *callback_recv_param);
+
+axis2_callback_recv_t* AXIS2_CALL
+axis2_callback_recv_create(axis2_env_t **env)
{
axis2_callback_recv_impl_t *callback_recv_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- callback_recv_impl = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_callback_recv_impl_t) );
+ callback_recv_impl =
+ AXIS2_MALLOC((*env)->allocator, sizeof(axis2_callback_recv_impl_t) );
+
if (!callback_recv_impl)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -84,7 +95,9 @@
/* initialize ops */
- callback_recv_impl->callback_recv.ops = AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_callback_recv_ops_t) );
+ callback_recv_impl->callback_recv.ops =
+ AXIS2_MALLOC( (*env)->allocator, sizeof(axis2_callback_recv_ops_t) );
+
if (!callback_recv_impl->callback_recv.ops)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -92,22 +105,29 @@
return NULL;
}
- callback_recv_impl->callback_recv.ops->get_base = axis2_callback_recv_get_base;
- callback_recv_impl->callback_recv.ops->free = axis2_callback_recv_free;
- callback_recv_impl->callback_recv.ops->add_callback = axis2_callback_recv_add_callback;
+ callback_recv_impl->callback_recv.ops->get_base =
+ axis2_callback_recv_get_base;
+
+ callback_recv_impl->callback_recv.ops->free =
+ axis2_callback_recv_free;
+
+ callback_recv_impl->callback_recv.ops->add_callback =
+ axis2_callback_recv_add_callback;
return &(callback_recv_impl->callback_recv);
}
-axis2_msg_recv_t* AXIS2_CALL axis2_callback_recv_get_base(struct axis2_callback_recv *callback_recv,
- axis2_env_t **env)
+axis2_msg_recv_t* AXIS2_CALL
+axis2_callback_recv_get_base(struct axis2_callback_recv *callback_recv,
+ axis2_env_t **env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(callback_recv)->base;
}
-axis2_status_t AXIS2_CALL axis2_callback_recv_free (struct axis2_callback_recv *callback_recv,
- axis2_env_t **env)
+axis2_status_t AXIS2_CALL
+axis2_callback_recv_free (struct axis2_callback_recv *callback_recv,
+ axis2_env_t **env)
{
axis2_callback_recv_impl_t *callback_recv_impl = NULL;
@@ -140,10 +160,11 @@
}
-axis2_status_t AXIS2_CALL axis2_callback_recv_add_callback(struct axis2_callback_recv *callback_recv,
- axis2_env_t **env,
- axis2_char_t *msg_id,
- axis2_callback_t *callback)
+axis2_status_t AXIS2_CALL
+axis2_callback_recv_add_callback(struct axis2_callback_recv *callback_recv,
+ axis2_env_t **env,
+ axis2_char_t *msg_id,
+ axis2_callback_t *callback)
{
axis2_callback_recv_impl_t *callback_recv_impl = NULL;
@@ -153,15 +174,17 @@
if (msg_id)
{
- axis2_hash_set(callback_recv_impl->callback_map, msg_id, AXIS2_HASH_KEY_STRING, callback);
+ axis2_hash_set(callback_recv_impl->callback_map,
+ msg_id, AXIS2_HASH_KEY_STRING, callback);
}
return AXIS2_SUCCESS;
}
-axis2_status_t AXIS2_CALL axis2_callback_recv_receive(axis2_msg_recv_t *msg_recv,
- axis2_env_t **env,
- axis2_msg_ctx_t *msg_ctx,
- void *callback_recv_param)
+axis2_status_t AXIS2_CALL
+axis2_callback_recv_receive(axis2_msg_recv_t *msg_recv,
+ axis2_env_t **env,
+ axis2_msg_ctx_t *msg_ctx,
+ void *callback_recv_param)
{
axis2_callback_recv_t *callback_recv = NULL;
axis2_callback_recv_impl_t *callback_recv_impl = NULL;
@@ -171,6 +194,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
callback_recv = (axis2_callback_recv_t*)callback_recv_param;
+
callback_recv_impl = AXIS2_INTF_TO_IMPL(callback_recv);
msg_info_headers = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env);
@@ -183,7 +207,9 @@
if (msg_id)
{
axis2_async_result_t *result = NULL;
- axis2_callback_t *callback = (axis2_callback_t*) axis2_hash_get(callback_recv_impl->callback_map, msg_id, AXIS2_HASH_KEY_STRING);
+ axis2_callback_t *callback = (axis2_callback_t*)
+ axis2_hash_get(callback_recv_impl->callback_map, msg_id, AXIS2_HASH_KEY_STRING);
+
result = axis2_async_result_create(env, msg_ctx);
if (callback && result)
{
Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.h?rev=388367&r1=388366&r2=388367&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.h (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.h Thu Mar 23 20:48:17 2006
@@ -50,14 +50,21 @@
*/
struct axis2_callback_recv_ops
{
- axis2_msg_recv_t* (AXIS2_CALL *get_base)(struct axis2_callback_recv *callback_recv,
- axis2_env_t **env);
- axis2_status_t (AXIS2_CALL *free)(struct axis2_callback_recv *callback_recv,
- axis2_env_t **env);
- axis2_status_t (AXIS2_CALL *add_callback)(struct axis2_callback_recv *callback_recv,
- axis2_env_t **env,
- axis2_char_t *msg_id,
- axis2_callback_t *callback);
+ axis2_msg_recv_t* (AXIS2_CALL *
+ get_base)(struct axis2_callback_recv *callback_recv,
+ axis2_env_t **env);
+
+
+ axis2_status_t (AXIS2_CALL *
+ free)(struct axis2_callback_recv *callback_recv,
+ axis2_env_t **env);
+
+
+ axis2_status_t (AXIS2_CALL *
+ add_callback)(struct axis2_callback_recv *callback_recv,
+ axis2_env_t **env,
+ axis2_char_t *msg_id,
+ axis2_callback_t *callback);
};
/**
@@ -69,13 +76,19 @@
axis2_callback_recv_ops_t *ops;
};
-AXIS2_DECLARE(axis2_callback_recv_t*) axis2_callback_recv_create(axis2_env_t **env);
+AXIS2_DECLARE(axis2_callback_recv_t*)
+axis2_callback_recv_create(axis2_env_t **env);
/************************** Start of function macros **************************/
-#define AXIS2_CALLBACK_RECV_GET_BASE(callback_recv, env) ((callback_recv)->ops->get_base(callback_recv, env))
-#define AXIS2_CALLBACK_RECV_FREE(callback_recv, env) ((callback_recv)->ops->free(callback_recv, env))
-#define AXIS2_CALLBACK_RECV_ADD_CALLBACK(callback_recv, env, msg_id, callback) ((callback_recv)->ops->add_callback(callback_recv, env, msg_id, callback))
+#define AXIS2_CALLBACK_RECV_GET_BASE(callback_recv, env) \
+ ((callback_recv)->ops->get_base(callback_recv, env))
+
+#define AXIS2_CALLBACK_RECV_FREE(callback_recv, env) \
+ ((callback_recv)->ops->free(callback_recv, env))
+
+#define AXIS2_CALLBACK_RECV_ADD_CALLBACK(callback_recv, env, msg_id, callback)\
+ ((callback_recv)->ops->add_callback(callback_recv, env, msg_id, callback))
/************************** End of function macros ****************************/