axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r382292 - in /webservices/axis2/trunk/c/modules: core/description/ core/transport/http/ core/transport/http/receiver/ util/ wsdl/ xml/om/ xml/soap/
Date Thu, 02 Mar 2006 04:21:59 GMT
Author: nandika
Date: Wed Mar  1 20:21:56 2006
New Revision: 382292

URL: http://svn.apache.org/viewcvs?rev=382292&view=rev
Log:
modified to compile for win32

Modified:
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
    webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
    webservices/axis2/trunk/c/modules/util/array_list.c
    webservices/axis2/trunk/c/modules/util/axis2_array_list.h
    webservices/axis2/trunk/c/modules/util/network_handler.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
    webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c
    webservices/axis2/trunk/c/modules/xml/om/om_comment.c
    webservices/axis2/trunk/c/modules/xml/om/om_doctype.c
    webservices/axis2/trunk/c/modules/xml/om/om_element.c
    webservices/axis2/trunk/c/modules/xml/om/om_node.c
    webservices/axis2/trunk/c/modules/xml/om/om_processing_instruction.c
    webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c
    webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/op.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Wed Mar  1 20:21:56 2006
@@ -950,10 +950,10 @@
                             axis2_qname_t *qname)
 {
     axis2_op_impl_t *op_impl = NULL;
-    
+    axis2_char_t *op_n = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 	op_impl = AXIS2_INTF_TO_IMPL(op);
-    axis2_char_t *op_n = AXIS2_QNAME_GET_LOCALPART(qname, env); 
+    op_n = AXIS2_QNAME_GET_LOCALPART(qname, env); 
     
     return AXIS2_WSDL_OP_SET_QNAME(op_impl->wsdl_op, env, qname);
 }

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c Wed Mar  1 20:21:56
2006
@@ -71,7 +71,8 @@
 							axis2_env_t **env, 
 							axis2_http_simple_request_t *request);
                             
-axis2_status_t axis2_http_worker_set_svr_port(axis2_http_worker_t *worker, 
+axis2_status_t AXIS2_CALL
+axis2_http_worker_set_svr_port(axis2_http_worker_t *worker, 
                             axis2_env_t **env, int port);
 	
 axis2_status_t AXIS2_CALL 
@@ -535,8 +536,9 @@
 	return header_map;
 }
 
-axis2_status_t axis2_http_worker_set_svr_port(axis2_http_worker_t *worker, 
-                                              axis2_env_t **env, int port)
+axis2_status_t AXIS2_CALL
+axis2_http_worker_set_svr_port(axis2_http_worker_t *worker, 
+                               axis2_env_t **env, int port)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_INTF_TO_IMPL(worker)->svr_port = port;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
(original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
Wed Mar  1 20:21:56 2006
@@ -90,7 +90,8 @@
                         (axis2_simple_http_svr_conn_t *svr_conn, 
                         axis2_env_t **env, axis2_char_t *buffer, int size);
                         
-axis2_char_t *axis2_simple_http_svr_conn_get_svr_ip
+axis2_char_t * AXIS2_CALL
+axis2_simple_http_svr_conn_get_svr_ip
                         (axis2_simple_http_svr_conn_t *svr_conn, 
                         axis2_env_t **env);
                                 
@@ -482,7 +483,8 @@
 						timeout);
 }
 
-axis2_char_t *axis2_simple_http_svr_conn_get_svr_ip(
+axis2_char_t* AXIS2_CALL 
+axis2_simple_http_svr_conn_get_svr_ip(
                         axis2_simple_http_svr_conn_t *svr_conn, 
                         axis2_env_t **env)
 {

Modified: webservices/axis2/trunk/c/modules/util/array_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/array_list.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/array_list.c (original)
+++ webservices/axis2/trunk/c/modules/util/array_list.c Wed Mar  1 20:21:56 2006
@@ -380,7 +380,7 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_status_t) 
 axis2_array_list_free_void_arg(void *array_list, 
                                 axis2_env_t **env)
 {

Modified: webservices/axis2/trunk/c/modules/util/axis2_array_list.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/axis2_array_list.h?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/axis2_array_list.h (original)
+++ webservices/axis2/trunk/c/modules/util/axis2_array_list.h Wed Mar  1 20:21:56 2006
@@ -191,7 +191,7 @@
     /**
      * Free array passed as void pointer.
      */
-    axis2_status_t AXIS2_CALL 
+    AXIS2_DECLARE(axis2_status_t)
     axis2_array_list_free_void_arg(void *array_list, 
                                 axis2_env_t **env);
 

Modified: webservices/axis2/trunk/c/modules/util/network_handler.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/network_handler.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/network_handler.c (original)
+++ webservices/axis2/trunk/c/modules/util/network_handler.c Wed Mar  1 20:21:56 2006
@@ -26,7 +26,7 @@
 axis2_bool_t axis2_init_socket();
 #endif
 
-AXIS2_DECLARE( axis2_socket_t )
+AXIS2_DECLARE(axis2_socket_t )
 axis2_network_handler_open_socket(axis2_env_t **env, char *server, int port)
 {
 	axis2_socket_t sock = AXIS2_INVALID_SOCKET;
@@ -141,7 +141,7 @@
 	return sock;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_DECLARE(axis2_status_t )
 axis2_network_handler_close_socket (axis2_env_t **env,  axis2_socket_t socket)
 {
 	AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
@@ -158,7 +158,7 @@
 	return AXIS2_SUCCESS;
 }
 
-axis2_status_t AXIS2_CALL
+AXIS2_DECLARE(axis2_status_t)
 axis2_network_handler_set_sock_option(axis2_env_t **env, axis2_socket_t socket, 
 						int option, int value)
 {
@@ -178,13 +178,13 @@
 axis2_network_handler_svr_socket_accept(axis2_env_t **env, 
 						axis2_socket_t svr_socket)
 {
-	axis2_socket_t cli_socket = AXIS2_INVALID_SOCKET;
 	struct sockaddr cli_addr;
-	axis2_socket_len_t cli_len = 0;
+	
 	struct linger ll;
 	int nodelay = 1;
+	axis2_socket_len_t cli_len = 0;
+	axis2_socket_t cli_socket = AXIS2_INVALID_SOCKET;
 
-	
 	AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
 	
 	cli_len = sizeof(cli_addr);
@@ -239,11 +239,13 @@
 #endif
 
 
-axis2_char_t* axis2_network_handler_get_svr_ip(axis2_env_t **env, 
-                        axis2_socket_t socket)
+AXIS2_DECLARE(axis2_char_t*)
+axis2_network_handler_get_svr_ip(axis2_env_t **env, 
+                                 axis2_socket_t socket)
 {
     struct sockaddr_in addr;
-    socklen_t len = sizeof(addr);
+    
+    axis2_socket_len_t len = sizeof(addr);
     char *ret = NULL;
     memset(&addr, 0, sizeof(addr));
     if(getsockname(socket, (struct sockaddr *)&addr, &len) < 0)

Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_interface.c Wed Mar  1 20:21:56 2006
@@ -286,10 +286,13 @@
         for (hi = axis2_hash_first (wsdl_interface_impl->ops, env); hi;
                  hi = axis2_hash_next ( env, hi))
         {
+            axis2_qname_t *op_qn = NULL;
+            axis2_wsdl_op_t *op_o = NULL;
+            axis2_char_t *op_n = NULL;
             axis2_hash_this (hi, NULL, NULL, &val);
-            axis2_wsdl_op_t *op_o = (axis2_wsdl_op_t *) val;
-            axis2_qname_t *op_qn = AXIS2_WSDL_OP_GET_QNAME(op_o, env);
-            axis2_char_t *op_n = AXIS2_QNAME_GET_LOCALPART(op_qn, env);
+            op_o = (axis2_wsdl_op_t *) val;
+            op_qn = AXIS2_WSDL_OP_GET_QNAME(op_o, env);
+            op_n = AXIS2_QNAME_GET_LOCALPART(op_qn, env);
             AXIS2_WSDL_OP_FREE_VOID_ARG(val, env);
             val = NULL;
                

Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_svc.c Wed Mar  1 20:21:56 2006
@@ -288,7 +288,7 @@
     axis2_char_t *name = NULL;
     
     AXIS2_ENV_CHECK(env, NULL);
-    AXIS2_PARAM_CHECK((*env)->error, qname, AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK((*env)->error, qname, NULL);
     wsdl_svc_impl = AXIS2_INTF_TO_IMPL(wsdl_svc);
 
     name = AXIS2_QNAME_TO_STRING(qname, env);
@@ -307,7 +307,7 @@
         /* Target Namespace not set and the Service Name is null */
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_WSDL_SVC, 
             AXIS2_FAILURE);
-        return AXIS2_FAILURE;
+        return NULL;
     }
     
     return AXIS2_QNAME_GET_URI(AXIS2_INTF_TO_IMPL(wsdl_svc)->qname, env);

Modified: webservices/axis2/trunk/c/modules/xml/om/om_comment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_comment.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_comment.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_comment.c Wed Mar  1 20:21:56 2006
@@ -97,7 +97,6 @@
     
     if (parent)
     {
-        AXIS2_OM_NODE_SET_PARENT((*node), env, parent);
         AXIS2_OM_NODE_ADD_CHILD(parent, env, (*node)); 
     }
 

Modified: webservices/axis2/trunk/c/modules/xml/om/om_doctype.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_doctype.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_doctype.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_doctype.c Wed Mar  1 20:21:56 2006
@@ -98,7 +98,6 @@
 
     if (parent)
     {
-        AXIS2_OM_NODE_SET_PARENT((*node), env, parent);
         AXIS2_OM_NODE_ADD_CHILD(parent, env, (*node));
     }
 

Modified: webservices/axis2/trunk/c/modules/xml/om/om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_element.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_element.c Wed Mar  1 20:21:56 2006
@@ -243,7 +243,6 @@
 
     if (parent)
     {
-        AXIS2_OM_NODE_SET_PARENT((*node), env, parent);
         AXIS2_OM_NODE_ADD_CHILD(parent, env, (*node));
     }
     

Modified: webservices/axis2/trunk/c/modules/xml/om/om_node.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_node.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_node.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_node.c Wed Mar  1 20:21:56 2006
@@ -337,7 +337,11 @@
 {
     AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, child, AXIS2_FAILURE);
-
+    if(AXIS2_INTF_TO_IMPL(child)->parent)
+    {
+        child = AXIS2_OM_NODE_DETACH(child, env);
+    }
+    
     if (AXIS2_INTF_TO_IMPL(om_node)->first_child  == NULL)
     {
         AXIS2_INTF_TO_IMPL(om_node)->first_child = child;

Modified: webservices/axis2/trunk/c/modules/xml/om/om_processing_instruction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_processing_instruction.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_processing_instruction.c Wed Mar  1 20:21:56
2006
@@ -125,7 +125,6 @@
     AXIS2_OM_NODE_SET_NODE_TYPE(*node, env, AXIS2_OM_PROCESSING_INSTRUCTION);
     if (parent)
     {
-        AXIS2_OM_NODE_SET_PARENT((*node), env, parent);
         AXIS2_OM_NODE_ADD_CHILD(parent, env, (*node)); 
     }
 

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap12_builder_helper.c Wed Mar  1 20:21:56
2006
@@ -178,8 +178,7 @@
     soap_envelope = AXIS2_SOAP_BUILDER_GET_SOAP_ENVELOPE(builder_helper_impl->soap_builder,
env);
     soap_body = AXIS2_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
     soap_fault = AXIS2_SOAP_BODY_GET_FAULT(soap_body, env);   
-    if(!soap_fault)
-        printf("soap fault null");
+   
     if(element_level == 4)
     {
         if(AXIS2_STRCMP(AXIS2_SOAP12_SOAP_FAULT_CODE_LOCAL_NAME, ele_localname) == 0)

Modified: webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c?rev=382292&r1=382291&r2=382292&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c (original)
+++ webservices/axis2/trunk/c/modules/xml/soap/soap_envelope.c Wed Mar  1 20:21:56 2006
@@ -332,6 +332,7 @@
     axis2_soap_envelope_impl_t *envelope_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     envelope_impl = AXIS2_INTF_TO_IMPL(envelope);
+
     /*
     if(envelope_impl->soap_version && envelope_impl->soap_version != soap_version)
     {



Mime
View raw message