axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r515013 - in /webservices/axis2/trunk/c: include/ modules/core/addr/ modules/core/clientapi/ modules/core/description/ modules/core/engine/ modules/core/transport/http/sender/ modules/mod_addr/
Date Tue, 06 Mar 2007 07:51:40 GMT
Author: pini
Date: Mon Mar  5 23:51:39 2007
New Revision: 515013

URL: http://svn.apache.org/viewvc?view=rev&rev=515013
Log:
Removing macros

Modified:
    webservices/axis2/trunk/c/include/axis2_relates_to.h
    webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
    webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
    webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
    webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
    webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
    webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
    webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c

Modified: webservices/axis2/trunk/c/include/axis2_relates_to.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_relates_to.h?view=diff&rev=515013&r1=515012&r2=515013
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_relates_to.h (original)
+++ webservices/axis2/trunk/c/include/axis2_relates_to.h Mon Mar  5 23:51:39 2007
@@ -115,26 +115,6 @@
     axis2_relates_to_free(struct axis2_relates_to *relates_to,
         const axis2_env_t *env);
 
-/** Gets value. */
-#define AXIS2_RELATES_TO_GET_VALUE(relates_to, env) \
-      axis2_relates_to_get_value(relates_to, env)
-
-/** Sets value. */
-#define AXIS2_RELATES_TO_SET_VALUE(relates_to, env, vlaue) \
-      axis2_relates_to_set_value(relates_to, env, vlaue)
-
-/** Gets relationship type. */
-#define AXIS2_RELATES_TO_GET_RELATIONSHIP_TYPE(relates_to, env) \
-      axis2_relates_to_get_relationship_type(relates_to, env)
-
-/** Sets relationship type. */
-#define AXIS2_RELATES_TO_SET_RELATIONSHIP_TYPE(relates_to, env, relationship_type) \
-      axis2_relates_to_set_relationship_type(relates_to, env, relationship_type)
-
-/** Frees relates to struct. */
-#define AXIS2_RELATES_TO_FREE(relates_to, env) \
-      axis2_relates_to_free(relates_to, env)
-
 /** @} */
 
 #ifdef __cplusplus

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=515013&r1=515012&r2=515013
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Mon Mar  5 23:51:39 2007
@@ -305,7 +305,7 @@
     }
     if (msg_info_headers->relates_to)
     {
-        AXIS2_RELATES_TO_FREE(msg_info_headers->relates_to, env);
+        axis2_relates_to_free(msg_info_headers->relates_to, env);
     }
 
     if (msg_info_headers->fault_to)

Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?view=diff&rev=515013&r1=515012&r2=515013
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Mon Mar  5 23:51:39 2007
@@ -234,7 +234,7 @@
         relates_to = axis2_msg_info_headers_get_relates_to(msg_info_headers, env);
         if (relates_to)
         {
-            const axis2_char_t *msg_id = AXIS2_RELATES_TO_GET_VALUE(relates_to, env);
+            const axis2_char_t *msg_id = axis2_relates_to_get_value(relates_to, env);
             if (msg_id)
             {
                 axis2_async_result_t *result = NULL;

Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=515013&r1=515012&r2=515013
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Mon Mar  5 23:51:39 2007
@@ -338,7 +338,7 @@
 
     if (epr)
     {
-        const axis2_char_t *to_url = AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
+        const axis2_char_t *to_url = axis2_endpoint_ref_get_address(epr, env);
 
         transport = axis2_get_transport_from_url(to_url, env);
     }

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/op.c?view=diff&rev=515013&r1=515012&r2=515013
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Mon Mar  5 23:51:39 2007
@@ -919,7 +919,7 @@
         const axis2_char_t *value = NULL;
 
         conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
-        value = AXIS2_RELATES_TO_GET_VALUE(relates_to, env);
+        value = axis2_relates_to_get_value(relates_to, env);
         op_ctx = AXIS2_CONF_CTX_GET_OP_CTX(conf_ctx, env, value);
         if (NULL == op_ctx)
         {

Modified: webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/addr_disp.c?view=diff&rev=515013&r1=515012&r2=515013
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/addr_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/addr_disp.c Mon Mar  5 23:51:39 2007
@@ -100,7 +100,7 @@
     {
         const 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)
         {
             axis2_char_t **url_tokens = NULL;
@@ -202,7 +202,7 @@
     if (relates_to)
     {
         const axis2_char_t *relates_to_value = NULL;
-        relates_to_value = AXIS2_RELATES_TO_GET_VALUE(relates_to, env);
+        relates_to_value = axis2_relates_to_get_value(relates_to, env);
         if (relates_to_value && AXIS2_STRCMP(relates_to_value, "") != 0)
         {
             axis2_conf_ctx_t *conf_ctx = NULL;

Modified: webservices/axis2/trunk/c/modules/core/engine/disp_checker.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/disp_checker.c?view=diff&rev=515013&r1=515012&r2=515013
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/disp_checker.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/disp_checker.c Mon Mar  5 23:51:39 2007
@@ -262,7 +262,7 @@
 
     endpoint_ref = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
     if (endpoint_ref)
-        address = AXIS2_ENDPOINT_REF_GET_ADDRESS(endpoint_ref, env);
+        address = axis2_endpoint_ref_get_address(endpoint_ref, env);
 
     svc = AXIS2_MSG_CTX_GET_SVC(msg_ctx, env);
     if (!svc)

Modified: webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c?view=diff&rev=515013&r1=515012&r2=515013
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c Mon Mar  5 23:51:39 2007
@@ -95,7 +95,7 @@
     {
         const 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)
         {
             axis2_char_t **url_tokens = NULL;
@@ -152,7 +152,7 @@
     {
         const 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)
         {
             axis2_char_t **url_tokens = 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=515013&r1=515012&r2=515013
==============================================================================
--- 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 Mon
Mar  5 23:51:39 2007
@@ -235,9 +235,9 @@
         axis2_endpoint_ref_t *ctx_epr = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
         if (ctx_epr && 0 != AXIS2_STRCMP(
                     AXIS2_WSA_ANONYMOUS_URL_SUBMISSION,
-                    AXIS2_ENDPOINT_REF_GET_ADDRESS(ctx_epr, env)) &&
+                    axis2_endpoint_ref_get_address(ctx_epr, env)) &&
                 0 != AXIS2_STRCMP(AXIS2_WSA_ANONYMOUS_URL,
-                        AXIS2_ENDPOINT_REF_GET_ADDRESS(ctx_epr, env)))
+                        axis2_endpoint_ref_get_address(ctx_epr, env)))
         {
             epr = ctx_epr;
         }
@@ -271,8 +271,8 @@
     AXIOM_OUTPUT_SET_SOAP11(om_output, env, AXIS2_MSG_CTX_GET_IS_SOAP_11(msg_ctx, env));
     if (epr)
     {
-        if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL_SUBMISSION, AXIS2_ENDPOINT_REF_GET_ADDRESS(epr,
env)) == 0 ||
-                AXIS2_STRCMP(AXIS2_WSA_NONE_URL, AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env))
== 0)
+        if (AXIS2_STRCMP(AXIS2_WSA_NONE_URL_SUBMISSION, axis2_endpoint_ref_get_address(epr,
env)) == 0 ||
+                AXIS2_STRCMP(AXIS2_WSA_NONE_URL, axis2_endpoint_ref_get_address(epr, env))
== 0)
         {
             epr = NULL;
         }
@@ -555,7 +555,7 @@
     AXIS2_PARAM_CHECK(env->error, epr, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, om_output, AXIS2_FAILURE);
 
-    url = AXIS2_ENDPOINT_REF_GET_ADDRESS(epr, env);
+    url = axis2_endpoint_ref_get_address(epr, env);
     
     soap_action = axis2_string_get_buffer(AXIS2_MSG_CTX_GET_SOAP_ACTION(msg_ctx, env), env);
     

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=515013&r1=515012&r2=515013
==============================================================================
--- webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c (original)
+++ webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c Mon Mar  5 23:51:39 2007
@@ -400,7 +400,7 @@
         if (relates_to)
         {
             const axis2_char_t *value = NULL;
-            value = AXIS2_RELATES_TO_GET_VALUE(relates_to, env);
+            value = axis2_relates_to_get_value(relates_to, env);
             relates_to_header_node =
                 axis2_addr_out_handler_process_string_info(env, value,
                         AXIS2_WSA_RELATES_TO,
@@ -411,7 +411,7 @@
         if (relates_to_header_node)
         {
             const axis2_char_t *relationship_type = NULL;
-            relationship_type = AXIS2_RELATES_TO_GET_RELATIONSHIP_TYPE(relates_to, env);
+            relationship_type = axis2_relates_to_get_relationship_type(relates_to, env);
             if (AXIS2_STRCMP(relationship_type, "") != 0)
             {
                 axiom_attribute_t *om_attr = NULL;



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message