You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/07 12:13:34 UTC
svn commit: r515533 - in /webservices/axis2/trunk/c: include/
modules/core/addr/ modules/core/engine/ modules/core/transport/http/sender/
modules/core/util/ modules/mod_addr/ rampart/samples/client/sec_echo/
savan/src/msgreceivers/
Author: pini
Date: Wed Mar 7 03:13:32 2007
New Revision: 515533
URL: http://svn.apache.org/viewvc?view=rev&rev=515533
Log:
Removing macros
Modified:
webservices/axis2/trunk/c/include/axis2_endpoint_ref.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/engine/engine.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/util/core_utils.c
webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c
webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
Modified: webservices/axis2/trunk/c/include/axis2_endpoint_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_endpoint_ref.h?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_endpoint_ref.h (original)
+++ webservices/axis2/trunk/c/include/axis2_endpoint_ref.h Wed Mar 7 03:13:32 2007
@@ -290,74 +290,6 @@
axis2_endpoint_ref_free(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env);
-/** Gets address. */
-#define AXIS2_ENDPOINT_REF_GET_ADDRESS(endpoint_ref, env) \
- axis2_endpoint_ref_get_address(endpoint_ref, env)
-
-/** Sets address. */
-#define AXIS2_ENDPOINT_REF_SET_ADDRESS(endpoint_ref, env, address) \
- axis2_endpoint_ref_set_address(endpoint_ref, env, address)
-
-/** Gets interface name. */
-#define AXIS2_ENDPOINT_REF_GET_INTERFACE_NAME(endpoint_ref, env) \
- axis2_endpoint_ref_get_interface_qname(endpoint_ref, env)
-
-/** Sets interface name. */
-#define AXIS2_ENDPOINT_REF_SET_INTERFACE_NAME(endpoint_ref, env, interface_qname)\
- axis2_endpoint_ref_set_interface_qname(endpoint_ref, env, interface_qname)
-
-/** Gets service name. */
-#define AXIS2_ENDPOINT_REF_GET_SVC_NAME(endpoint_ref, env) \
- axis2_endpoint_ref_get_svc_name(endpoint_ref, env)
-
-/** Sets service name. */
-#define AXIS2_ENDPOINT_REF_SET_SVC_NAME(endpoint_ref, env, svc_name) \
- axis2_endpoint_ref_set_svc_name(endpoint_ref, env, svc_name)
-
-/** Gets reference parameter list. */
-#define AXIS2_ENDPOINT_REF_GET_REF_PARAM_LIST(endpoint_ref, env) \
- axis2_endpoint_ref_get_ref_param_list(endpoint_ref, env)
-
-/** Gets metadata list. */
-#define AXIS2_ENDPOINT_REF_GET_METADATA_LIST(endpoint_ref, env) \
- axis2_endpoint_ref_get_metadata_list(endpoint_ref, env)
-
-/** Adds reference parameter. */
-#define AXIS2_ENDPOINT_REF_ADD_REF_PARAM(endpoint_ref, env, node) \
- axis2_endpoint_ref_add_ref_param(endpoint_ref, env, node)
-
-/** Adds metadata. */
-#define AXIS2_ENDPOINT_REF_ADD_METADATA(endpoint_ref, env, node) \
- axis2_endpoint_ref_add_metadata(endpoint_ref, env, node)
-
-/** Frees endpoint reference. */
-#define AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env) \
- axis2_endpoint_ref_free(endpoint_ref, env)
-
-/** Gets reference attribute list. */
-#define AXIS2_ENDPOINT_REF_GET_REF_ATTRIBUTE_LIST(endpoint_ref, env) \
- axis2_endpoint_ref_get_ref_attribute_list(endpoint_ref, env)
-
-/** Gets metadata attribute list. */
-#define AXIS2_ENDPOINT_REF_GET_META_ATTRIBUTE_LIST(endpoint_ref, env) \
- axis2_endpoint_ref_get_metadata_attribute_list(endpoint_ref, env)
-
-/** Gets reference extension list. */
-#define AXIS2_ENDPOINT_REF_GET_REF_EXTENSION_LIST(endpoint_ref, env) \
- axis2_endpoint_ref_get_extension_list(endpoint_ref, env)
-
-/** Adds reference attribute. */
-#define AXIS2_ENDPOINT_REF_ADD_REF_ATTRIBUTE(endpoint_ref, env, attr) \
- axis2_endpoint_ref_add_ref_attribute(endpoint_ref, env, attr)
-
-/** Adds metadata attribute. */
-#define AXIS2_ENDPOINT_REF_ADD_META_ATTRIBUTE(endpoint_ref, env, attr) \
- axis2_endpoint_ref_add_metadata_attribute(endpoint_ref, env, attr)
-
-/** Adds extension. */
-#define AXIS2_ENDPOINT_REF_ADD_EXTENSION(endpoint_ref, env, node) \
- axis2_endpoint_ref_add_extension(endpoint_ref, env, node)
-
/** @} */
Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Wed Mar 7 03:13:32 2007
@@ -40,8 +40,7 @@
};
axis2_endpoint_ref_t *AXIS2_CALL
-axis2_endpoint_ref_create(
- const axis2_env_t *env,
+axis2_endpoint_ref_create(const axis2_env_t *env,
const axis2_char_t *address)
{
axis2_endpoint_ref_t *endpoint_ref = NULL;
@@ -49,7 +48,7 @@
AXIS2_ENV_CHECK(env, NULL);
endpoint_ref = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_endpoint_ref_t));
+ sizeof(axis2_endpoint_ref_t));
if (!endpoint_ref)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -79,19 +78,15 @@
return endpoint_ref;
}
-
const axis2_char_t *AXIS2_CALL
-axis2_endpoint_ref_get_address(
- const axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_get_address(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return endpoint_ref->address;
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_address(
- axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_set_address(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
const axis2_char_t *address)
{
@@ -99,7 +94,6 @@
if (endpoint_ref->address)
{
AXIS2_FREE(env->allocator, endpoint_ref->address);
- endpoint_ref->address = NULL;
}
endpoint_ref->address = AXIS2_STRDUP(address, env);
@@ -107,17 +101,14 @@
}
const axis2_qname_t *AXIS2_CALL
-axis2_endpoint_ref_get_interface_qname(
- const axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_get_interface_qname(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return endpoint_ref->interface_qname;
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_interface_qname(
- axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_set_interface_qname(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
const axis2_qname_t *interface_qname)
{
@@ -128,17 +119,14 @@
}
axis2_svc_name_t *AXIS2_CALL
-axis2_endpoint_ref_get_svc_name(
- const axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_get_svc_name(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
return endpoint_ref->svc_name;
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_set_svc_name(
- axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_set_svc_name(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axis2_svc_name_t *svc_name)
{
@@ -148,8 +136,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_free_void_arg(
- void *endpoint_ref,
+axis2_endpoint_ref_free_void_arg(void *endpoint_ref,
const axis2_env_t *env)
{
axis2_endpoint_ref_t *endpoint_ref_l = NULL;
@@ -161,8 +148,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_free(
- axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_free(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -170,70 +156,55 @@
if (endpoint_ref->address)
{
AXIS2_FREE(env->allocator, endpoint_ref->address);
- endpoint_ref->address = NULL;
}
if (endpoint_ref->ref_param_list)
{
axis2_array_list_free(endpoint_ref->ref_param_list, env);
- endpoint_ref->ref_param_list = NULL;
}
if (endpoint_ref->metadata_list)
{
axis2_array_list_free(endpoint_ref->metadata_list, env);
- endpoint_ref->metadata_list = NULL;
}
if (endpoint_ref->ref_attribute_list)
{
axis2_array_list_free(endpoint_ref->ref_attribute_list, env);
- endpoint_ref->ref_attribute_list = NULL;
}
if (endpoint_ref->meta_attribute_list)
{
axis2_array_list_free(endpoint_ref->meta_attribute_list, env);
- endpoint_ref->meta_attribute_list = NULL;
}
if (endpoint_ref->extension_list)
{
axis2_array_list_free(endpoint_ref->extension_list, env);
- endpoint_ref->extension_list = NULL;
}
AXIS2_FREE(env->allocator, endpoint_ref);
- endpoint_ref = NULL;
return AXIS2_SUCCESS;
}
axis2_array_list_t *AXIS2_CALL
-axis2_endpoint_ref_get_ref_param_list(
- const axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_get_ref_param_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return endpoint_ref->ref_param_list;
}
axis2_array_list_t *AXIS2_CALL
-axis2_endpoint_ref_get_metadata_list(
- const axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_get_metadata_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return endpoint_ref->metadata_list;
}
-
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_ref_param(
- axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_add_ref_param(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *ref_param_node)
{
@@ -251,15 +222,15 @@
if (endpoint_ref->ref_param_list && ref_param_node)
{
- return axis2_array_list_add(endpoint_ref->ref_param_list, env, ref_param_node);
+ return axis2_array_list_add(endpoint_ref->ref_param_list, env,
+ ref_param_node);
}
return AXIS2_FAILURE;
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_metadata(
- axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_add_metadata(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *meta_data_node)
{
@@ -277,7 +248,8 @@
if (endpoint_ref->metadata_list && meta_data_node)
{
- return axis2_array_list_add(endpoint_ref->metadata_list, env, meta_data_node);
+ return axis2_array_list_add(endpoint_ref->metadata_list, env,
+ meta_data_node);
}
return AXIS2_FAILURE;
@@ -285,38 +257,28 @@
axis2_array_list_t *AXIS2_CALL
-axis2_endpoint_ref_get_ref_attribute_list(
- const axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_get_ref_attribute_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return endpoint_ref->ref_attribute_list;
}
axis2_array_list_t *AXIS2_CALL
-axis2_endpoint_ref_get_metadata_attribute_list(
- const axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_get_metadata_attribute_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return endpoint_ref->meta_attribute_list;
}
axis2_array_list_t *AXIS2_CALL
-axis2_endpoint_ref_get_extension_list(
- const axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_get_extension_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return endpoint_ref->extension_list;
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_ref_attribute(
- axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_add_ref_attribute(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_attribute_t *attr)
{
@@ -334,15 +296,15 @@
if (endpoint_ref->ref_attribute_list && attr)
{
- return axis2_array_list_add(endpoint_ref->ref_attribute_list, env, attr);
+ return axis2_array_list_add(endpoint_ref->ref_attribute_list, env,
+ attr);
}
return AXIS2_FAILURE;
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_metadata_attribute(
- axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_add_metadata_attribute(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_attribute_t *attr)
{
@@ -367,8 +329,7 @@
}
axis2_status_t AXIS2_CALL
-axis2_endpoint_ref_add_extension(
- axis2_endpoint_ref_t *endpoint_ref,
+axis2_endpoint_ref_add_extension(axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env,
axiom_node_t *extension_node)
{
@@ -386,7 +347,8 @@
if (endpoint_ref->extension_list && extension_node)
{
- return axis2_array_list_add(endpoint_ref->extension_list, env, extension_node);
+ return axis2_array_list_add(endpoint_ref->extension_list, env,
+ extension_node);
}
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Wed Mar 7 03:13:32 2007
@@ -122,7 +122,7 @@
we consider that to be a reset,
so don't free */
{
- AXIS2_ENDPOINT_REF_FREE(msg_info_headers->to, env);
+ axis2_endpoint_ref_free(msg_info_headers->to, env);
msg_info_headers->to = NULL;
}
msg_info_headers->to = to;
@@ -293,15 +293,15 @@
if (msg_info_headers->to)
{
- AXIS2_ENDPOINT_REF_FREE(msg_info_headers->to, env);
+ axis2_endpoint_ref_free(msg_info_headers->to, env);
}
if (msg_info_headers->from)
{
- AXIS2_ENDPOINT_REF_FREE(msg_info_headers->from, env);
+ axis2_endpoint_ref_free(msg_info_headers->from, env);
}
if (msg_info_headers->reply_to)
{
- AXIS2_ENDPOINT_REF_FREE(msg_info_headers->reply_to, env);
+ axis2_endpoint_ref_free(msg_info_headers->reply_to, env);
}
if (msg_info_headers->relates_to)
{
@@ -310,7 +310,7 @@
if (msg_info_headers->fault_to)
{
- AXIS2_ENDPOINT_REF_FREE(msg_info_headers->fault_to, env);
+ axis2_endpoint_ref_free(msg_info_headers->fault_to, env);
}
if (msg_info_headers->ref_params)
Modified: webservices/axis2/trunk/c/modules/core/engine/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/engine.c?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/engine.c Wed Mar 7 03:13:32 2007
@@ -595,7 +595,7 @@
fault_to = AXIS2_MSG_CTX_GET_FAULT_TO(processing_context, env);
if (fault_to)
{
- const axis2_char_t *address = AXIS2_ENDPOINT_REF_GET_ADDRESS(fault_to, env);
+ const axis2_char_t *address = axis2_endpoint_ref_get_address(fault_to, env);
if (!address)
{
fault_to = NULL;
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Wed Mar 7 03:13:32 2007
@@ -406,7 +406,7 @@
{
if (epr)
{
- AXIS2_ENDPOINT_REF_FREE(epr, env);
+ axis2_endpoint_ref_free(epr, env);
epr = NULL;
}
}
Modified: webservices/axis2/trunk/c/modules/core/util/core_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/util/core_utils.c?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/modules/core/util/core_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/util/core_utils.c Wed Mar 7 03:13:32 2007
@@ -93,7 +93,7 @@
axis2_endpoint_ref_t *epr = NULL;
axis2_char_t *address = NULL;
- address = AXIS2_ENDPOINT_REF_GET_ADDRESS (endpoint_ref, env);
+ address = axis2_endpoint_ref_get_address(endpoint_ref, env);
if (address)
{
epr = axis2_endpoint_ref_create (env, address);
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c Wed Mar 7 03:13:32 2007
@@ -537,7 +537,7 @@
child_qn = AXIOM_ELEMENT_GET_QNAME(child_ele, env, child_node);
if (axis2_addr_in_check_element(env, epr_addr_qn, child_qn))
{
- AXIS2_ENDPOINT_REF_SET_ADDRESS(endpoint_ref, env,
+ axis2_endpoint_ref_set_address(endpoint_ref, env,
AXIOM_ELEMENT_GET_TEXT(child_ele, env, child_node));
}
else if (axis2_addr_in_check_element(env, epr_ref_qn , child_qn))
@@ -668,7 +668,7 @@
attr_value = AXIOM_ATTRIBUTE_GET_LOCALNAME(is_ref_param_attr, env);
if (AXIS2_STRCMP("true", attr_value) == 0)
{
- AXIS2_ENDPOINT_REF_ADD_REF_PARAM(to_epr, env, header_block_node);
+ axis2_endpoint_ref_add_ref_param(to_epr, env, header_block_node);
}
}
}
Modified: webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Wed Mar 7 03:13:32 2007
@@ -249,13 +249,13 @@
axis2_endpoint_ref_t *fault_epr = axis2_msg_info_headers_get_fault_to(msg_info_headers, env);
if (fault_epr)
{
- const axis2_char_t *fault_address = AXIS2_ENDPOINT_REF_GET_ADDRESS(fault_epr, env);
+ const axis2_char_t *fault_address = axis2_endpoint_ref_get_address(fault_epr, env);
if (fault_address)
{
if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL, fault_address) != 0 &&
AXIS2_STRCMP(AXIS2_WSA_NONE_URL_SUBMISSION, fault_address) != 0)
{
- AXIS2_ENDPOINT_REF_SET_ADDRESS(epr, env, fault_address);
+ axis2_endpoint_ref_set_address(epr, env, fault_address);
}
}
}
@@ -265,7 +265,7 @@
if (epr)
{
- address = AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
+ address = axis2_endpoint_ref_get_address(epr, env);
if (address && AXIS2_STRCMP(address, "") != 0)
{
axiom_node_t *to_header_block_node = NULL;
@@ -339,7 +339,7 @@
*/
/*if( epr)
{
- AXIS2_ENDPOINT_REF_FREE(epr, env);
+ axis2_endpoint_ref_free(epr, env);
epr = NULL;
}*/
@@ -555,7 +555,7 @@
addr_ns_obj = NULL;
}
- address = AXIS2_ENDPOINT_REF_GET_ADDRESS(endpoint_ref, env);
+ address = axis2_endpoint_ref_get_address(endpoint_ref, env);
if (address && AXIS2_STRCMP("", address) != 0)
{
axiom_node_t *hb_node = NULL;
@@ -590,7 +590,7 @@
axis2_addr_out_handler_add_to_header(env, endpoint_ref,
&header_block_node, addr_ns);
- ref_param_list = AXIS2_ENDPOINT_REF_GET_REF_PARAM_LIST(endpoint_ref, env);
+ ref_param_list = axis2_endpoint_ref_get_ref_param_list(endpoint_ref, env);
if (ref_param_list && axis2_array_list_size(ref_param_list, env) > 0)
{
axiom_node_t *reference_node = NULL;
@@ -606,7 +606,7 @@
addr_ns_obj,
&reference_node);
- ref_attribute_list = AXIS2_ENDPOINT_REF_GET_REF_ATTRIBUTE_LIST(endpoint_ref, env);
+ ref_attribute_list = axis2_endpoint_ref_get_ref_attribute_list(endpoint_ref, env);
if (ref_attribute_list)
{
int j = 0;
@@ -631,7 +631,7 @@
}
- meta_data_list = AXIS2_ENDPOINT_REF_GET_METADATA_LIST(endpoint_ref, env);
+ meta_data_list = axis2_endpoint_ref_get_metadata_list(endpoint_ref, env);
if (meta_data_list && axis2_array_list_size(meta_data_list, env) > 0)
{
axiom_node_t *reference_node = NULL;
@@ -650,7 +650,7 @@
&reference_node);
}
- meta_attribute_list = AXIS2_ENDPOINT_REF_GET_META_ATTRIBUTE_LIST(endpoint_ref, env);
+ meta_attribute_list = axis2_endpoint_ref_get_metadata_attribute_list(endpoint_ref, env);
if (meta_attribute_list)
{
int j = 0;
@@ -674,7 +674,7 @@
}
}
- extension_list = AXIS2_ENDPOINT_REF_GET_REF_EXTENSION_LIST(endpoint_ref, env);
+ extension_list = axis2_endpoint_ref_get_extension_list(endpoint_ref, env);
if (extension_list && axis2_array_list_size(extension_list, env) > 0)
{
int i = 0;
@@ -712,7 +712,7 @@
parent_node = *(parent_node_p);
- interface_qname = AXIS2_ENDPOINT_REF_GET_INTERFACE_NAME(epr, env);
+ interface_qname = axis2_endpoint_ref_get_interface_qname(epr, env);
if (interface_qname)
{
@@ -760,7 +760,7 @@
}
- service_name = AXIS2_ENDPOINT_REF_GET_SVC_NAME(epr, env);
+ service_name = axis2_endpoint_ref_get_svc_name(epr, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c (original)
+++ webservices/axis2/trunk/c/rampart/samples/client/sec_echo/echo.c Wed Mar 7 03:13:32 2007
@@ -137,7 +137,7 @@
}
/* if (endpoint_ref)
{
- AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env);
+ axis2_endpoint_ref_free(endpoint_ref, env);
endpoint_ref = NULL;
}
*/
Modified: webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c?view=diff&rev=515533&r1=515532&r2=515533
==============================================================================
--- webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c (original)
+++ webservices/axis2/trunk/c/savan/src/msgreceivers/savan_msg_recv.c Wed Mar 7 03:13:32 2007
@@ -217,7 +217,7 @@
&addr_node);
old_info_header = AXIS2_MSG_CTX_GET_MSG_INFO_HEADERS(msg_ctx, env);
submgr_epr = axis2_msg_info_headers_get_to(old_info_header, env);
- submgr_addr = AXIS2_ENDPOINT_REF_GET_ADDRESS(submgr_epr, env);
+ submgr_addr = axis2_endpoint_ref_get_address(submgr_epr, env);
AXIOM_ELEMENT_SET_TEXT(addr_elem, env, submgr_addr, addr_node);
/* Get subscriber id from the msg ctx */
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org