You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/03/28 16:36:44 UTC
svn commit: r389510 - in /webservices/axis2/trunk/c/modules/xml:
attachments/axis2_mime_output.h attachments/mime_output.c om/om_output.c
Author: sahan
Date: Tue Mar 28 06:36:37 2006
New Revision: 389510
URL: http://svn.apache.org/viewcvs?rev=389510&view=rev
Log:
Some changes to compile on windows
Modified:
webservices/axis2/trunk/c/modules/xml/attachments/axis2_mime_output.h
webservices/axis2/trunk/c/modules/xml/attachments/mime_output.c
webservices/axis2/trunk/c/modules/xml/om/om_output.c
Modified: webservices/axis2/trunk/c/modules/xml/attachments/axis2_mime_output.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/attachments/axis2_mime_output.h?rev=389510&r1=389509&r2=389510&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/attachments/axis2_mime_output.h (original)
+++ webservices/axis2/trunk/c/modules/xml/attachments/axis2_mime_output.h Tue Mar 28 06:36:37 2006
@@ -57,7 +57,8 @@
{
axis2_byte_t* (AXIS2_CALL *complete)(axis2_mime_output_t *mime_output,
- axis2_env_t **env, axis2_byte_t **output_stream,
+ axis2_env_t **env, axis2_byte_t **output_stream,
+ int *output_stream_size,
axis2_char_t *string_to_write,
axis2_array_list_t *binary_node_list,
axis2_char_t *boundary, axis2_char_t *content_id,
Modified: webservices/axis2/trunk/c/modules/xml/attachments/mime_output.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/attachments/mime_output.c?rev=389510&r1=389509&r2=389510&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/modules/xml/attachments/mime_output.c Tue Mar 28 06:36:37 2006
@@ -49,7 +49,8 @@
axis2_status_t axis2_char_2_byte(axis2_env_t **env, axis2_char_t *char_buffer, axis2_byte_t **byte_buffer, int *byte_buffer_size);
-axis2_status_t axis2_char_2_byte(axis2_env_t **env, axis2_char_t *char_buffer, axis2_byte_t **byte_buffer, int *byte_buffer_size)
+axis2_status_t
+axis2_char_2_byte(axis2_env_t **env, axis2_char_t *char_buffer, axis2_byte_t **byte_buffer, int *byte_buffer_size)
{
int length;
int i = 0;
@@ -64,7 +65,8 @@
bytes[i] = (axis2_byte_t) char_buffer[i];
}
byte_buffer = &bytes;
- *byte_buffer_size = length;
+ *byte_buffer_size = length;
+ return AXIS2_SUCCESS;
}
/***************************** Function headers *******************************/
@@ -80,7 +82,7 @@
axis2_array_list_t *binary_node_list,
axis2_char_t *boundary, axis2_char_t *content_id,
axis2_char_t *char_set_encoding,axis2_char_t *soap_content_type);
-axis2_status_t * AXIS2_CALL
+axis2_status_t AXIS2_CALL
axis2_start_writing_mime (axis2_mime_output_t *mime_output,
axis2_env_t **env, axis2_byte_t **output_stream,
int *output_stream_size, axis2_char_t *boundary);
@@ -186,7 +188,9 @@
*/
axis2_char_t *encoding_string = NULL;
axis2_char_t *header_value = NULL;
- axis2_char_t *content_id_string = NULL;
+ axis2_char_t *content_id_string = NULL;
+ axis2_data_handler_t *data_handler = NULL;
+ axis2_mime_body_part_t *root_mime_body_part = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -195,11 +199,11 @@
encoding_string = AXIS2_STRDUP("text/xml; charset=", env);
AXIS2_STRACAT(encoding_string, char_set_encoding, env);
- axis2_data_handler_t *data_handler = axis2_data_handler_create(env, (void*)string_to_write, encoding_string);
+ data_handler = axis2_data_handler_create(env, (void*)string_to_write, encoding_string);
- axis2_mime_body_part_t *root_mime_body_part = axis2_mime_body_part_create(env);
+ root_mime_body_part = axis2_mime_body_part_create(env);
/*@TODO please check the correctness of the parameters passed*/
- axis2_mime_body_part_set_data_handler(root_mime_body_part, env ,data_handler);
+ AXIS2_MIME_BODY_PART_SET_DATA_HANDLER(root_mime_body_part, env ,data_handler);
header_value = AXIS2_STRDUP("application/xop+xml; charset=", env);
AXIS2_STRACAT(header_value, char_set_encoding, env);
@@ -207,13 +211,13 @@
AXIS2_STRACAT(header_value, soap_content_type, env);
AXIS2_STRACAT(header_value, "\";", env);
/*@TODO please check the correctness of the parameters passed*/
- axis2_mime_body_part_add_header(root_mime_body_part, env, "content-transfer-encoding","binary");
+ AXIS2_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-transfer-encoding","binary");
AXIS2_STRACAT(content_id_string, "<", env);
AXIS2_STRACAT(content_id_string, content_id, env);
AXIS2_STRACAT(content_id_string, ">", env);
/*@TODO please check the correctness of the parameters passed*/
- axis2_mime_body_part_add_header(root_mime_body_part, env, "content-id",content_id_string);
+ AXIS2_MIME_BODY_PART_ADD_HEADER(root_mime_body_part, env, "content-id",content_id_string);
/***/
/*@TODO please check the correctness of the parameters passed*/
axis2_write_body_part (mime_output, env, output_stream, output_stream_size, root_mime_body_part, boundary);
@@ -242,8 +246,9 @@
boundary);
finishWritingMime(outStream);
- */
- }
+ */
+ return NULL;
+}
/**
@@ -251,13 +256,14 @@
* The method is a private method and is called from axis2_output_complete method
*/
-axis2_status_t * AXIS2_CALL
+axis2_status_t AXIS2_CALL
axis2_start_writing_mime (axis2_mime_output_t *mime_output,
axis2_env_t **env, axis2_byte_t **output_stream,
int *output_stream_size, axis2_char_t *boundary)
{
- AXIS2_ENV_CHECK(env, NULL);
- axis2_write_mime_boundary (mime_output, env, output_stream, output_stream_size, boundary);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ axis2_write_mime_boundary (mime_output, env, output_stream, output_stream_size, boundary);
+ return AXIS2_SUCCESS;
}
@@ -279,7 +285,7 @@
axis2_byte_t *byte_stream;
int size;
- AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
axis2_char_2_byte(env, boundary, &byte_buffer, &size);
byte_stream = AXIS2_MALLOC((*env)->allocator, (size + 1) * sizeof(axis2_byte_t));
@@ -289,7 +295,7 @@
AXIS2_FREE((*env)->allocator, byte_buffer);
output_stream = &byte_stream;
- output_stream_size = size + 1;
+ *output_stream_size = size + 1;
return AXIS2_SUCCESS;
}
@@ -307,7 +313,8 @@
*mimeBodyPart.addHeader("content-transfer-encoding", "binary");
*return mimeBodyPart;
*/
- AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_ENV_CHECK(env, NULL);
+ return NULL;
}
@@ -340,7 +347,7 @@
axis2_byte_t *byte_stream;
int size;
- AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
axis2_char_2_byte(env, boundary, &byte_buffer, &size);
byte_stream = AXIS2_MALLOC((*env)->allocator, (size + 2) * sizeof(axis2_byte_t));
@@ -353,7 +360,7 @@
AXIS2_FREE((*env)->allocator, byte_buffer);
output_stream = &byte_stream;
- output_stream_size = size + 2;
+ *output_stream_size = size + 2;
return AXIS2_SUCCESS;
@@ -375,7 +382,7 @@
axis2_byte_t *byte_stream;
int size;
- AXIS2_ENV_CHECK(env, NULL);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
axis2_char_2_byte(env, boundary, &byte_buffer, &size);
byte_stream = AXIS2_MALLOC((*env)->allocator, (size + 2) * sizeof(axis2_byte_t));
@@ -383,7 +390,7 @@
AXIS2_FREE((*env)->allocator, byte_buffer);
output_stream = &byte_stream;
- output_stream_size = size + 2;
+ *output_stream_size = size + 2;
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/xml/om/om_output.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_output.c?rev=389510&r1=389509&r2=389510&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_output.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_output.c Tue Mar 28 06:36:37 2006
@@ -537,10 +537,10 @@
axis2_om_output_is_optimized(axis2_om_output_t *om_output,axis2_env_t **env)
{
axis2_bool_t is_optimized = AXIS2_FALSE;
-
+ axis2_om_output_format_t *om_output_format = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- axis2_om_output_format_t *om_output_format = axis2_om_output_format_create(env);
+ om_output_format = axis2_om_output_format_create(env);
is_optimized = AXIS2_OM_OUTPUT_FORMAT_IS_OPTIMIZED(om_output_format, env);
return is_optimized;
}