axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r375175 - in /webservices/axis2/trunk/c: include/ modules/core/transport/http/
Date Mon, 06 Feb 2006 05:07:02 GMT
Author: nandika
Date: Sun Feb  5 21:07:01 2006
New Revision: 375175

URL: http://svn.apache.org/viewcvs?rev=375175&view=rev
Log:
modified to compile on vc7

Modified:
    webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h
    webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h
    webservices/axis2/trunk/c/include/axis2_http_request_line.h
    webservices/axis2/trunk/c/include/axis2_http_status_line.h
    webservices/axis2/trunk/c/include/axis2_http_transport_utils.h
    webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c
    webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c
    webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c
    webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
    webservices/axis2/trunk/c/modules/core/transport/http/http_worker.c

Modified: webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h?rev=375175&r1=375174&r2=375175&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h Sun Feb  5 21:07:01 2006
@@ -74,7 +74,7 @@
 };
 
 
-axis2_http_chunked_stream_t * AXIS2_CALL 
+AXIS2_DECLARE(axis2_http_chunked_stream_t *) 
 axis2_http_chunked_stream_create(axis2_env_t **env, axis2_stream_t* stream);
 /********************* Start of function macros	***************************/
 

Modified: webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h?rev=375175&r1=375174&r2=375175&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_out_transport_info.h Sun Feb  5 21:07:01
2006
@@ -70,7 +70,7 @@
 };
 
 
-axis2_http_out_transport_info_t * AXIS2_CALL 
+AXIS2_DECLARE(axis2_http_out_transport_info_t *) 
 axis2_http_out_transport_info_create(axis2_env_t **env,
 					axis2_http_simple_response_t *response);
 

Modified: webservices/axis2/trunk/c/include/axis2_http_request_line.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_http_request_line.h?rev=375175&r1=375174&r2=375175&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_request_line.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_request_line.h Sun Feb  5 21:07:01 2006
@@ -77,10 +77,11 @@
 };
 
 
-axis2_http_request_line_t * AXIS2_CALL 
+AXIS2_DECLARE(axis2_http_request_line_t *) 
 axis2_http_request_line_create(axis2_env_t **env, axis2_char_t *method, 
                                 axis2_char_t *uri, axis2_char_t *http_version);
-axis2_http_request_line_t* AXIS2_CALL 
+
+AXIS2_DECLARE(axis2_http_request_line_t*)
 axis2_http_request_line_parse_line(axis2_env_t **env, const axis2_char_t *str);
 /********************* Start of function macros	***************************/
 

Modified: webservices/axis2/trunk/c/include/axis2_http_status_line.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_http_status_line.h?rev=375175&r1=375174&r2=375175&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_status_line.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_status_line.h Sun Feb  5 21:07:01 2006
@@ -75,7 +75,7 @@
 };
 
 
-axis2_http_status_line_t * AXIS2_CALL 
+AXIS2_DECLARE(axis2_http_status_line_t *) 
 axis2_http_status_line_create(axis2_env_t **env, axis2_char_t *str);
 
 /************************* Start of function macros    ***************************/

Modified: webservices/axis2/trunk/c/include/axis2_http_transport_utils.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_http_transport_utils.h?rev=375175&r1=375174&r2=375175&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_transport_utils.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_transport_utils.h Sun Feb  5 21:07:01 2006
@@ -58,7 +58,7 @@
 };
 typedef struct axis2_callback_info axis2_callback_info_t;
 
-axis2_status_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_status_t)
 axis2_http_transport_utils_process_http_post_request
                         (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx, 
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -66,7 +66,7 @@
                         axis2_char_t *soap_action_header,
                         axis2_char_t *request_uri);
     
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t)
 axis2_http_transport_utils_process_http_get_request
                         (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx,
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -75,42 +75,42 @@
                         axis2_char_t *request_uri, axis2_conf_ctx_t *conf_ctx, 
                         axis2_hash_t *request_params);
     
-axis2_soap_envelope_t* AXIS2_CALL 
+AXIS2_DECLARE(axis2_soap_envelope_t*)
 axis2_http_transport_utils_create_envelope_from_get_request
                         (axis2_env_t **env, axis2_char_t *request_uri,
                         axis2_hash_t *request_params);
     
-axis2_om_stax_builder_t* AXIS2_CALL 
+AXIS2_DECLARE(axis2_om_stax_builder_t*)
 axis2_http_transport_utils_select_builder_for_mime
                         (axis2_env_t **env, axis2_char_t *request_uri,
                         axis2_msg_ctx_t *msg_ctx, axis2_stream_t *in_stream,
                         axis2_char_t *content_type);
    
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t) 
 axis2_http_transport_utils_do_write_mtom(axis2_env_t **env, 
                                         axis2_msg_ctx_t *msg_ctx);
                                                 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t) 
 axis2_http_transport_utils_is_doing_rest(axis2_env_t **env, 
                                         axis2_msg_ctx_t *msg_ctx);
                                                 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t) 
 axis2_http_transport_utils_is_doing_rest_through_post
                         (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx);
 						
-axis2_hash_t *AXIS2_CALL
+AXIS2_DECLARE(axis2_hash_t *)
 axis2_http_transport_utils_get_request_params(axis2_env_t **env, 
 						axis2_char_t *request_uri);
 						
-axis2_char_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_char_t*)
 axis2_http_transport_utils_get_services_html(axis2_env_t **env, 
 							axis2_conf_ctx_t *conf_ctx);
 
-axis2_hash_t *AXIS2_CALL
+AXIS2_DECLARE(axis2_hash_t *)
 axis2_http_transport_utils_get_request_params(axis2_env_t **env, 
 						axis2_char_t *request_uri);
 
-axis2_soap_envelope_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_soap_envelope_t*)
 axis2_http_transport_utils_create_soap_msg(axis2_env_t **env, 
                         axis2_msg_ctx_t *msg_ctx, axis2_char_t *soap_ns_uri);
 

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c?rev=375175&r1=375174&r2=375175&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_chunked_stream.c Sun Feb  5
21:07:01 2006
@@ -66,14 +66,14 @@
                         axis2_env_t **env);				
 /***************************** End of function headers ************************/
 
-axis2_http_chunked_stream_t * AXIS2_CALL 
+AXIS2_DECLARE(axis2_http_chunked_stream_t *)
 axis2_http_chunked_stream_create(axis2_env_t **env, axis2_stream_t *stream)
 {
+    axis2_http_chunked_stream_impl_t *chunked_stream_impl = NULL;
     AXIS2_ENV_CHECK(env, NULL);
     AXIS2_PARAM_CHECK((*env)->error, stream, NULL);
         
-    axis2_http_chunked_stream_impl_t *chunked_stream_impl = 
-                        (axis2_http_chunked_stream_impl_t *)AXIS2_MALLOC 
+    chunked_stream_impl = (axis2_http_chunked_stream_impl_t *)AXIS2_MALLOC 
                         ((*env)->allocator, sizeof(
                         axis2_http_chunked_stream_impl_t));
 	
@@ -158,7 +158,7 @@
 		if(chunked_stream_impl->unread_len < yet_to_read)
 		{
 			len = AXIS2_STREAM_READ(chunked_stream_impl->stream, env, 
-						buffer + count - yet_to_read, 
+						(axis2_char_t*)buffer + count - yet_to_read, 
 						chunked_stream_impl->unread_len);
 			yet_to_read -= len;
 			chunked_stream_impl->unread_len -= len;
@@ -170,7 +170,7 @@
 		else
 		{
 			len = AXIS2_STREAM_READ(chunked_stream_impl->stream, env, 
-						buffer + count - yet_to_read, 
+						(axis2_char_t*)buffer + count - yet_to_read, 
 						yet_to_read);
 			yet_to_read -= len;	
 			chunked_stream_impl->unread_len -= len;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c?rev=375175&r1=375174&r2=375175&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_request_line.c Sun Feb  5 21:07:01
2006
@@ -67,7 +67,7 @@
                             axis2_env_t **env);								
 /***************************** End of function headers ************************/
 
-axis2_http_request_line_t * AXIS2_CALL 
+AXIS2_DECLARE(axis2_http_request_line_t *) 
 axis2_http_request_line_create(axis2_env_t **env, axis2_char_t *method, 
                                 axis2_char_t *uri, axis2_char_t *http_version)
 {
@@ -144,7 +144,7 @@
 	return AXIS2_SUCCESS;
 }
 
-axis2_http_request_line_t* AXIS2_CALL 
+AXIS2_DECLARE(axis2_http_request_line_t*) 
 axis2_http_request_line_parse_line(axis2_env_t **env, const axis2_char_t *str)
 {
     axis2_char_t *req_line = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c?rev=375175&r1=375174&r2=375175&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_status_line.c Sun Feb  5 21:07:01
2006
@@ -63,7 +63,7 @@
                                     axis2_env_t **env);	
 /***************************** End of function headers ************************/
 
-axis2_http_status_line_t * AXIS2_CALL 
+AXIS2_DECLARE(axis2_http_status_line_t *)
 axis2_http_status_line_create(axis2_env_t **env, axis2_char_t *str)
 {
     axis2_char_t *tmp_status_line = NULL;

Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=375175&r1=375174&r2=375175&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Sun Feb 
5 21:07:01 2006
@@ -33,7 +33,7 @@
 
 /***************************** Function headers *******************************/
 
-axis2_status_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_status_t)
 axis2_http_transport_utils_process_http_post_request
                         (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx, 
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -41,7 +41,7 @@
                         axis2_char_t *soap_action_header,
                         axis2_char_t *request_uri);
     
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t) 
 axis2_http_transport_utils_process_http_get_request
                         (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx,
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -50,55 +50,55 @@
                         axis2_char_t *request_uri, axis2_conf_ctx_t *conf_ctx, 
                         axis2_hash_t *request_params);
     
-axis2_soap_envelope_t* AXIS2_CALL 
+AXIS2_DECLARE(axis2_soap_envelope_t*)
 axis2_http_transport_utils_create_envelope_from_get_request
                         (axis2_env_t **env, axis2_char_t *request_uri,
                         axis2_hash_t *request_params);
     
-axis2_om_stax_builder_t* AXIS2_CALL 
+AXIS2_DECLARE(axis2_om_stax_builder_t* )
 axis2_http_transport_utils_select_builder_for_mime
                         (axis2_env_t **env, axis2_char_t *request_uri,
                         axis2_msg_ctx_t *msg_ctx, axis2_stream_t *in_stream,
                         axis2_char_t *content_type);
     
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t ) 
 axis2_http_transport_utils_is_optimized(axis2_env_t **env, 
                                         axis2_om_element_t *om_element);
                                                 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t ) 
 axis2_http_transport_utils_do_write_mtom(axis2_env_t **env, 
                                         axis2_msg_ctx_t *msg_ctx);
                                                 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t ) 
 axis2_http_transport_utils_is_doing_rest(axis2_env_t **env, 
                                         axis2_msg_ctx_t *msg_ctx);
                                                 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t) 
 axis2_http_transport_utils_is_doing_rest_through_post
                         (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx);
 						
-axis2_status_t AXIS2_CALL
+AXIS2_DECLARE(axis2_status_t)
 axis2_http_transport_utils_strdecode(axis2_env_t **env, axis2_char_t *dest, 
 						axis2_char_t *src);
 						
-int AXIS2_CALL
+AXIS2_DECLARE(int)
 axis2_http_transport_utils_hexit(axis2_char_t c);
 
-axis2_char_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_char_t* )
 axis2_http_transport_utils_get_services_html(axis2_env_t **env, 
 							axis2_conf_ctx_t *conf_ctx);
-axis2_char_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_char_t*)
 axis2_http_transport_utils_get_charset_enc(axis2_env_t **env, 
 						axis2_char_t *content_type);
 int
 axis2_http_transport_utils_on_data_request(char *buffer, int size, void *ctx);
 
-axis2_soap_envelope_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_soap_envelope_t*)
 axis2_http_transport_utils_create_soap_msg(axis2_env_t **env, 
                         axis2_msg_ctx_t *msg_ctx, axis2_char_t *soap_ns_uri);
 /***************************** End of function headers ************************/
 
-axis2_status_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_status_t ) 
 axis2_http_transport_utils_process_http_post_request
                         (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx, 
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -316,7 +316,7 @@
 }
 
 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t) 
 axis2_http_transport_utils_process_http_get_request
                         (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx,
                         axis2_stream_t *in_stream, axis2_stream_t *out_stream,
@@ -374,7 +374,7 @@
 }
 
 
-axis2_soap_envelope_t* AXIS2_CALL 
+AXIS2_DECLARE(axis2_soap_envelope_t*)
 axis2_http_transport_utils_create_envelope_from_get_request
                         (axis2_env_t **env, axis2_char_t *request_uri,
                         axis2_hash_t *request_params)
@@ -436,7 +436,7 @@
 }
 
 
-axis2_om_stax_builder_t* AXIS2_CALL 
+AXIS2_DECLARE(axis2_om_stax_builder_t* )
 axis2_http_transport_utils_select_builder_for_mime
                         (axis2_env_t **env, axis2_char_t *request_uri,
                         axis2_msg_ctx_t *msg_ctx, axis2_stream_t *in_stream,
@@ -449,7 +449,7 @@
 }
 
 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t ) 
 axis2_http_transport_utils_is_optimized(axis2_env_t **env, 
                                         axis2_om_element_t *om_element)
 {
@@ -460,7 +460,7 @@
 }
 
 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t) 
 axis2_http_transport_utils_do_write_mtom(axis2_env_t **env, 
                                         axis2_msg_ctx_t *msg_ctx)
 {
@@ -471,7 +471,7 @@
 }
 
 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t) 
 axis2_http_transport_utils_is_doing_rest(axis2_env_t **env, 
                                         axis2_msg_ctx_t *msg_ctx)
 {
@@ -482,7 +482,7 @@
 }
 
 
-axis2_bool_t AXIS2_CALL 
+AXIS2_DECLARE(axis2_bool_t) 
 axis2_http_transport_utils_is_doing_rest_through_post
                         (axis2_env_t **env, axis2_msg_ctx_t *msg_ctx)
 {
@@ -492,7 +492,7 @@
     return AXIS2_FALSE;
 }
 
-axis2_hash_t *AXIS2_CALL
+AXIS2_DECLARE(axis2_hash_t *)
 axis2_http_transport_utils_get_request_params(axis2_env_t **env, 
 						axis2_char_t *request_uri)
 {
@@ -555,7 +555,7 @@
 }
 
 
-axis2_status_t AXIS2_CALL
+AXIS2_DECLARE(axis2_status_t)
 axis2_http_transport_utils_strdecode(axis2_env_t **env, axis2_char_t *dest, 
 						axis2_char_t *src)
 {
@@ -582,7 +582,7 @@
 }
 
 
-int AXIS2_CALL
+AXIS2_DECLARE(int )
 axis2_http_transport_utils_hexit(axis2_char_t c)
 {
 	if ( c >= '0' && c <= '9' )
@@ -600,7 +600,7 @@
 	return 0;           /* shouldn't happen, we're guarded by isxdigit() */
 }
 
-axis2_char_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_char_t*)
 axis2_http_transport_utils_get_services_html(axis2_env_t **env, 
 							axis2_conf_ctx_t *conf_ctx)
 {
@@ -719,7 +719,7 @@
 	return ret;
 }
 
-axis2_char_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_char_t*)
 axis2_http_transport_utils_get_charset_enc(axis2_env_t **env, 
 						axis2_char_t *content_type)
 {
@@ -791,7 +791,7 @@
 	return 0;	
 }
 
-axis2_soap_envelope_t* AXIS2_CALL
+AXIS2_DECLARE(axis2_soap_envelope_t*)
 axis2_http_transport_utils_create_soap_msg(axis2_env_t **env, 
                         axis2_msg_ctx_t *msg_ctx, axis2_char_t *soap_ns_uri)
 {

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=375175&r1=375174&r2=375175&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 Sun Feb  5 21:07:01
2006
@@ -75,7 +75,7 @@
 								
 /***************************** End of function headers ************************/
 
-axis2_http_worker_t * AXIS2_CALL 
+AXIS2_DECLARE(axis2_http_worker_t *)
 axis2_http_worker_create (axis2_env_t **env, axis2_conf_ctx_t *conf_ctx)
 {
     axis2_http_worker_impl_t *http_worker_impl = NULL;



Mime
View raw message