axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shan...@apache.org
Subject svn commit: r890650 - in /webservices/axis2/trunk/c/axiom: include/axiom_data_handler.h include/axiom_mime_parser.h include/axiom_mime_part.h src/attachments/data_handler.c src/attachments/mime_parser.c src/om/om_text.c
Date Tue, 15 Dec 2009 05:36:33 GMT
Author: shankar
Date: Tue Dec 15 05:36:33 2009
New Revision: 890650

URL: http://svn.apache.org/viewvc?rev=890650&view=rev
Log:
Fixing warnings for 64bit compilation

Modified:
    webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
    webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h
    webservices/axis2/trunk/c/axiom/include/axiom_mime_part.h
    webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c
    webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
    webservices/axis2/trunk/c/axiom/src/om/om_text.c

Modified: webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h?rev=890650&r1=890649&r2=890650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h Tue Dec 15 05:36:33 2009
@@ -112,7 +112,7 @@
      * @param env environment, MUST NOT be NULL.
      * @return status code, AXIS2_SUCCESS on success and AXIS2_FAILURE on error.
      */
-    AXIS2_EXTERN int AXIS2_CALL
+    AXIS2_EXTERN size_t AXIS2_CALL
     axiom_data_handler_get_input_stream_len(
         axiom_data_handler_t * data_handler,
         const axutil_env_t * env);
@@ -129,7 +129,7 @@
         axiom_data_handler_t * data_handler,
         const axutil_env_t * env,
         axis2_byte_t ** output_stream,
-        int *output_stream_size);
+        size_t *output_stream_size);
 
     /**
      * @param data_handler, a pointer to data handler struct
@@ -142,7 +142,7 @@
         axiom_data_handler_t * data_handler,
         const axutil_env_t * env,
         axis2_byte_t * input_stream,
-        int input_stream_len);
+        size_t input_stream_len);
 
     /**
      * @param data_handler, a pointer to data handler struct

Modified: webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h?rev=890650&r1=890649&r2=890650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_mime_parser.h Tue Dec 15 05:36:33 2009
@@ -114,7 +114,7 @@
       * @param env Environment. MUST NOT be NULL.
       * @return the length of the SOAP Body
       */
-    AXIS2_EXTERN int AXIS2_CALL
+    AXIS2_EXTERN size_t AXIS2_CALL
     axiom_mime_parser_get_soap_body_len(
         axiom_mime_parser_t * mime_parser,
         const axutil_env_t * env);

Modified: webservices/axis2/trunk/c/axiom/include/axiom_mime_part.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_mime_part.h?rev=890650&r1=890649&r2=890650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_mime_part.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_mime_part.h Tue Dec 15 05:36:33 2009
@@ -71,7 +71,7 @@
         /* Size of the part. In the case of buffer this is 
          * the buffer size and in the case of file this is 
            the file size */
-        int part_size;    
+        size_t part_size;
 
         /* This is one from the above defined enum */
         axiom_mime_part_type_t type;

Modified: webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c?rev=890650&r1=890649&r2=890650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c Tue Dec 15 05:36:33 2009
@@ -32,7 +32,7 @@
     axis2_byte_t *buffer;
 
     /* The length of the buffer */
-    int buffer_len;
+    size_t buffer_len;
 
     /* Is this a data_handler with a file name or a buffer*/
     axiom_data_handler_type_t data_handler_type;
@@ -182,7 +182,7 @@
     return data_handler->buffer;
 }
 
-AXIS2_EXTERN int AXIS2_CALL
+AXIS2_EXTERN size_t AXIS2_CALL
 axiom_data_handler_get_input_stream_len(
     axiom_data_handler_t *data_handler,
     const axutil_env_t *env)
@@ -199,7 +199,7 @@
     axiom_data_handler_t *data_handler,
     const axutil_env_t *env,
     axis2_byte_t **output_stream,
-    int *output_stream_size)
+    size_t *output_stream_size)
 {
     if(data_handler->data_handler_type == AXIOM_DATA_HANDLER_TYPE_BUFFER)
     {
@@ -350,7 +350,7 @@
     axiom_data_handler_t *data_handler,
     const axutil_env_t *env,
     axis2_byte_t *input_stream,
-    int input_stream_len)
+    size_t input_stream_len)
 {
     data_handler->buffer = input_stream;
     data_handler->buffer_len = input_stream_len;

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c?rev=890650&r1=890649&r2=890650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Tue Dec 15 05:36:33 2009
@@ -31,14 +31,14 @@
     axutil_hash_t *mime_parts_map;
 
     /* This is the actual SOAP part len */
-    int soap_body_len;
+    size_t soap_body_len;
 
     /* The SOAP part of the message */
     axis2_char_t *soap_body_str;
 
     /* The size of the buffer we give to the callback to
      * read data */
-    int buffer_size;
+    size_t buffer_size;
 
     /* The number of buffers */
     int max_buffers;
@@ -54,7 +54,7 @@
 
     axis2_char_t **buf_array;
 
-    int *len_array;
+    size_t *len_array;
 
     int current_buf_num;
 
@@ -71,19 +71,19 @@
 
     /*The buffers and the lengths need to be searched*/
     axis2_char_t *buffer1;
-    int len1;
+    size_t len1;
     axis2_char_t *buffer2;
-    int len2;
+    size_t len2;
 
     /*Flag to keep what type of search is this buffer has done*/
     axis2_bool_t primary_search;
 
     /*The offset where we found the pattern entirely in one buffer*/
-    int match_len1;
+    size_t match_len1;
 
     /*when pattern contains in two buffers the length of partial pattern
      in buffer2 */
-    int match_len2;
+    size_t match_len2;
 
     /*Whether we need caching or not*/
     axis2_bool_t cached;
@@ -92,7 +92,7 @@
     void *handler;
 
     /* Size of the binary when writing to the buffer*/
-    int binary_size;
+    size_t binary_size;
 };
 
 typedef struct axiom_search_info axiom_search_info_t;
@@ -108,10 +108,10 @@
     AXIS2_READ_INPUT_CALLBACK callback,
     void *callback_ctx,
     int *buf_num,
-    int *len_array,
+    size_t *len_array,
     axis2_char_t **buf_array,
     axiom_search_info_t *search_info,
-    int size,
+    size_t size,
     axis2_char_t *mime_boundary,
     axiom_mime_parser_t *mime_parser);
 
@@ -121,17 +121,17 @@
     AXIS2_READ_INPUT_CALLBACK callback,
     void *callback_ctx,
     int *buf_num,
-    int *len_array,
+    size_t *len_array,
     axis2_char_t **buf_array,
     axiom_search_info_t *search_info,
-    int size,
+    size_t size,
     axiom_mime_parser_t *mime_parser);
 
-static int
+static size_t
 axiom_mime_parser_calculate_part_len(
     const axutil_env_t *env,
     int buf_num,
-    int *len_list,
+    size_t *len_list,
     int maker,
     axis2_char_t *pos,
     axis2_char_t *buf);
@@ -139,9 +139,9 @@
 static axis2_char_t *
 axiom_mime_parser_create_part(
     const axutil_env_t *env,
-    int part_len,
+    size_t part_len,
     int buf_num,
-    int *len_list,
+    size_t *len_list,
     int marker,
     axis2_char_t *pos,
     axis2_char_t **buf_list,
@@ -159,10 +159,10 @@
     AXIS2_READ_INPUT_CALLBACK callback,
     void *callback_ctx,
     int *buf_num,
-    int *len_array,
+    size_t *len_array,
     axis2_char_t **buf_array,
     axiom_search_info_t *search_info,
-    int size,
+    size_t size,
     axis2_char_t *mime_boundary,
     axis2_char_t *mime_id,
     void *user_param);
@@ -174,7 +174,7 @@
     axis2_char_t *mime_id,
     axis2_char_t *mime_type,
     axis2_char_t *mime_binary,
-    int mime_binary_len,
+    size_t mime_binary_len,
     axis2_bool_t cached);
 
 static void
@@ -188,7 +188,7 @@
 axiom_mime_parser_cache_to_buffer(
     const axutil_env_t *env,
     axis2_char_t *buf,
-    int buf_len,
+    size_t buf_len,
     axiom_search_info_t *search_info,
     axiom_mime_parser_t *mime_parser);
 
@@ -209,7 +209,7 @@
 axiom_mime_parser_cache_to_file(
     const axutil_env_t* env,
     axis2_char_t *buf,
-    int buf_len,
+    size_t buf_len,
     void *handler);
 
 static void*
@@ -313,21 +313,21 @@
     void *callback_ctx,
     axis2_char_t * mime_boundary)
 {
-    int size = 0;
+    size_t size = 0;
     axis2_char_t *soap_str = NULL;
-    int soap_len = 0;
-    int temp_mime_boundary_size = 0;
+    size_t soap_len = 0;
+    size_t temp_mime_boundary_size = 0;
     axis2_char_t *temp_mime_boundary = NULL;
     axis2_char_t **buf_array = NULL;
-    int *len_array = NULL;
+    size_t *len_array = NULL;
     int buf_num = 0;
     axis2_char_t *pos = NULL;
     axiom_search_info_t *search_info = NULL;
     int part_start = 0;
     axis2_bool_t end_of_mime = AXIS2_FALSE;
-    int len = 0;
+    size_t len = 0;
     axis2_char_t *buffer = NULL;
-    int malloc_len = 0;
+    size_t malloc_len = 0;
     axis2_callback_info_t *callback_info = NULL;
 
     callback_info = (axis2_callback_info_t *)callback_ctx;
@@ -348,7 +348,7 @@
 
     /*Keeps the corresponding lengths of buffers in buf_array*/
 
-    len_array = AXIS2_MALLOC(env->allocator, sizeof(int) * (mime_parser->max_buffers));
+    len_array = AXIS2_MALLOC(env->allocator, sizeof(size_t) * (mime_parser->max_buffers));
 
     if(!len_array)
     {
@@ -372,7 +372,7 @@
 
     if(buf_array[buf_num])
     {
-        len = callback(buf_array[buf_num], size, (void *)callback_ctx);
+        len = callback(buf_array[buf_num], (int)size, (void *)callback_ctx);
     }
     if(len > 0)
     {
@@ -439,7 +439,7 @@
             {
                 /* There is more data so fill the remaining from the  stream*/
 
-                len = callback(buffer + malloc_len, size - malloc_len, (void *)callback_ctx);
+                len = callback(buffer + malloc_len, (int)(size - malloc_len), (void *)callback_ctx);
             }
             else
             {
@@ -484,7 +484,7 @@
             }
             if(axiom_mime_parser_is_more_data(mime_parser, env, callback_info))
             {
-                len = callback(buffer + malloc_len, size - malloc_len, (void *)callback_ctx);
+                len = callback(buffer + malloc_len, (int)(size - malloc_len), (void *)callback_ctx);
             }
             else
             {
@@ -566,7 +566,7 @@
                 }
                 if(axiom_mime_parser_is_more_data(mime_parser, env, callback_info))
                 {
-                    len = callback(buffer + malloc_len, size - malloc_len, (void *)callback_ctx);
+                    len = callback(buffer + malloc_len,(int)(size - malloc_len),(void *)callback_ctx);
                 }
                 else
                 {
@@ -586,7 +586,7 @@
         }
     }
 
-    /* This is the condition where the --MIMEBOUNDARY is devided among two
+    /* This is the condition where the --MIMEBOUNDARY is divided among two
      * buffers */
 
     else if(search_info->match_len2 > 0)
@@ -596,7 +596,7 @@
 
         if(soap_len > 0)
         {
-            /* Here we pass buf_num-1 becasue buf_num does not have any thing we want to
+            /* Here we pass buf_num-1 because buf_num does not have any thing we want to
              * for this particular part. It begins with the latter part of the search string
*/
 
             soap_str = axiom_mime_parser_create_part(env, soap_len, buf_num - 1, len_array,
@@ -622,7 +622,7 @@
 
                 if(axiom_mime_parser_is_more_data(mime_parser, env, callback_info))
                 {
-                    len = callback(buffer + malloc_len, size - malloc_len, (void *)callback_ctx);
+                    len = callback(buffer + malloc_len,(int)(size - malloc_len),(void *)callback_ctx);
                 }
                 else
                 {
@@ -691,13 +691,13 @@
     axis2_char_t *pos = NULL;
     int part_start = 0;
     axis2_char_t **buf_array = NULL;
-    int *len_array = NULL;
+    size_t *len_array = NULL;
     int buf_num = 0;
-    int size = 0;
-    int malloc_len = 0;
+    size_t size = 0;
+    size_t malloc_len = 0;
     axis2_callback_info_t *callback_info = NULL;
     axis2_char_t *temp_mime_boundary = NULL;
-    int temp_mime_boundary_size = 0;
+    size_t temp_mime_boundary_size = 0;
     axis2_bool_t end_of_mime = AXIS2_FALSE;
 
     callback_info = (axis2_callback_info_t *)callback_ctx;
@@ -731,8 +731,8 @@
         /*First we will search for \r\n\r\n*/
         axis2_char_t *mime_id = NULL;
         axis2_char_t *mime_type = NULL;
-        int mime_headers_len = 0;
-        int mime_binary_len = 0;
+        size_t mime_headers_len = 0;
+        size_t mime_binary_len = 0;
         axis2_char_t *mime_binary = NULL;
         axis2_char_t *mime_headers = NULL;
         axis2_char_t *buffer = NULL;
@@ -796,8 +796,7 @@
 
                     if(axiom_mime_parser_is_more_data(mime_parser, env, callback_info))
                     {
-                        len
-                            = callback(buffer + malloc_len, size - malloc_len, (void *)callback_ctx);
+                        len = callback(buffer + malloc_len,(int)(size - malloc_len),(void
*)callback_ctx);
                     }
                     else
                     {
@@ -849,8 +848,7 @@
                     }
                     if(axiom_mime_parser_is_more_data(mime_parser, env, callback_info))
                     {
-                        len
-                            = callback(buffer + malloc_len, size - malloc_len, (void *)callback_ctx);
+                        len = callback(buffer + malloc_len,(int)(size - malloc_len),(void*)callback_ctx);
                     }
                     else
                     {
@@ -980,8 +978,7 @@
                     {
                         if(axiom_mime_parser_is_more_data(mime_parser, env, callback_info))
                         {
-                            len = callback(buffer + malloc_len, size - malloc_len,
-                                (void *)callback_ctx);
+                            len = callback(buffer + malloc_len,(int)(size - malloc_len),(void*)callback_ctx);
                         }
                         else
                         {
@@ -1022,8 +1019,7 @@
                     {
                         if(axiom_mime_parser_is_more_data(mime_parser, env, callback_info))
                         {
-                            len = callback(buffer + malloc_len, size - malloc_len,
-                                (void *)callback_ctx);
+                            len = callback(buffer + malloc_len,(int)(size - malloc_len),(void
*)callback_ctx);
                         }
                         else
                         {
@@ -1132,10 +1128,10 @@
     AXIS2_READ_INPUT_CALLBACK callback,
     void *callback_ctx,
     int *buf_num,
-    int *len_array,
+    size_t *len_array,
     axis2_char_t **buf_array,
     axiom_search_info_t *search_info,
-    int size,
+    size_t size,
     axiom_mime_parser_t *mime_parser)
 {
     axis2_char_t *found = NULL;
@@ -1171,7 +1167,7 @@
 
         if(buf_array[*buf_num])
         {
-            len = callback(buf_array[*buf_num], size, (void *)callback_ctx);
+            len = callback(buf_array[*buf_num], (int)size, (void *)callback_ctx);
         }
         if(len > 0)
         {
@@ -1209,10 +1205,10 @@
     AXIS2_READ_INPUT_CALLBACK callback,
     void *callback_ctx,
     int *buf_num,
-    int *len_array,
+    size_t *len_array,
     axis2_char_t **buf_array,
     axiom_search_info_t *search_info,
-    int size,
+    size_t size,
     axis2_char_t *mime_boundary,
     axiom_mime_parser_t *mime_parser)
 {
@@ -1249,7 +1245,7 @@
 
         if(buf_array[*buf_num])
         {
-            len = callback(buf_array[*buf_num], size, (void *)callback_ctx);
+            len = callback(buf_array[*buf_num], (int)size, (void *)callback_ctx);
         }
         if(len > 0)
         {
@@ -1295,10 +1291,10 @@
     AXIS2_READ_INPUT_CALLBACK callback,
     void *callback_ctx,
     int *buf_num,
-    int *len_array,
+    size_t *len_array,
     axis2_char_t **buf_array,
     axiom_search_info_t *search_info,
-    int size,
+    size_t size,
     axis2_char_t *mime_boundary,
     axis2_char_t *mime_id,
     void *user_param)
@@ -1307,7 +1303,7 @@
     int len = 0;
     axis2_status_t status = AXIS2_FAILURE;
     axis2_char_t *temp = NULL;
-    int temp_length = 0;
+    size_t temp_length = 0;
     axis2_char_t *file_name = NULL;
 
     search_info->search_str = mime_boundary;
@@ -1359,7 +1355,7 @@
                     /* Caching callback is loaded. So we can cache the previous buffer */
                     status
                         = AXIOM_MTOM_CACHING_CALLBACK_CACHE(mime_parser->mtom_caching_callback,
-                            env, buf_array[*buf_num - 1], len_array[*buf_num - 1],
+                            env, buf_array[*buf_num - 1], (int)len_array[*buf_num - 1],
                             search_info->handler);
                 }
             }
@@ -1378,7 +1374,7 @@
                     encoded_mime_id = AXIS2_MALLOC(env->allocator, (sizeof(axis2_char_t))
                         * (strlen(mime_id)));
                     memset(encoded_mime_id, 0, strlen(mime_id));
-                    encoded_mime_id = axutil_url_encode(env, encoded_mime_id, mime_id, strlen(
+                    encoded_mime_id = axutil_url_encode(env, encoded_mime_id, mime_id, (int)strlen(
                         mime_id));
                     if(!encoded_mime_id)
                     {
@@ -1432,7 +1428,7 @@
             if(buf_array[*buf_num])
             {
                 /*The cached buffer is the one which get filled.*/
-                len = callback(buf_array[*buf_num], size, (void *)callback_ctx);
+                len = callback(buf_array[*buf_num], (int)size, (void *)callback_ctx);
             }
         }
 
@@ -1445,7 +1441,7 @@
 
             if(buf_array[*buf_num])
             {
-                len = callback(buf_array[*buf_num], size, (void *)callback_ctx);
+                len = callback(buf_array[*buf_num], (int)size, (void *)callback_ctx);
             }
         }
 
@@ -1503,12 +1499,12 @@
             if(mime_parser->mtom_caching_callback)
             {
                 status = AXIOM_MTOM_CACHING_CALLBACK_CACHE(mime_parser->mtom_caching_callback,
env,
-                    buf_array[*buf_num - 1], len_array[*buf_num - 1], search_info->handler);
+                    buf_array[*buf_num - 1], (int)len_array[*buf_num - 1], search_info->handler);
                 if(status == AXIS2_SUCCESS)
                 {
                     status
                         = AXIOM_MTOM_CACHING_CALLBACK_CACHE(mime_parser->mtom_caching_callback,
-                            env, buf_array[*buf_num], found - buf_array[*buf_num] - 2,
+                            env, buf_array[*buf_num], (int)(found - buf_array[*buf_num] -
2),
                             search_info->handler);
                 }
             }
@@ -1545,7 +1541,7 @@
             if(mime_parser->mtom_caching_callback)
             {
                 status = AXIOM_MTOM_CACHING_CALLBACK_CACHE(mime_parser->mtom_caching_callback,
env,
-                    buf_array[*buf_num - 1], search_info->match_len1 - 2, search_info->handler);
+                    buf_array[*buf_num - 1], (int)(search_info->match_len1 - 2), search_info->handler);
             }
 
             else if(mime_parser->attachment_dir)
@@ -1613,16 +1609,16 @@
 /*marker is the starting buffer of the required 
  part and pos is the end point of that part  */
 
-static int
+static size_t
 axiom_mime_parser_calculate_part_len(
     const axutil_env_t *env,
     int buf_num,
-    int *len_list,
+    size_t *len_list,
     int marker,
     axis2_char_t *pos,
     axis2_char_t *buf)
 {
-    int part_len = 0;
+    size_t part_len = 0;
     int i = 0;
 
     for(i = marker; i < buf_num; i++)
@@ -1638,9 +1634,9 @@
 static axis2_char_t *
 axiom_mime_parser_create_part(
     const axutil_env_t *env,
-    int part_len,
+    size_t part_len,
     int buf_num,
-    int *len_list,
+    size_t *len_list,
     int marker,
     axis2_char_t *pos,
     axis2_char_t **buf_list,
@@ -1652,7 +1648,7 @@
 
     axis2_char_t *part_str = NULL;
     int i = 0;
-    int temp = 0;
+    size_t temp = 0;
 
     part_str = AXIS2_MALLOC(env->allocator, sizeof(char) * (part_len + 1));
 
@@ -1690,7 +1686,7 @@
     return mime_parser->mime_parts_map;
 }
 
-AXIS2_EXTERN int AXIS2_CALL
+AXIS2_EXTERN size_t AXIS2_CALL
 axiom_mime_parser_get_soap_body_len(
     axiom_mime_parser_t * mime_parser,
     const axutil_env_t * env)
@@ -1718,8 +1714,8 @@
     axis2_char_t *pos = NULL;
     axis2_char_t *old_pos = NULL;
     axis2_char_t *found = NULL;
-    int str_length = 0;
-    int search_length = 0;
+    size_t str_length = 0;
+    size_t search_length = 0;
 
     str_length = strlen(search_info->search_str);
 
@@ -1779,7 +1775,7 @@
 
     else
     {
-        int offset = 0;
+        size_t offset = 0;
         pos = NULL;
         old_pos = NULL;
         found = NULL;
@@ -1865,7 +1861,7 @@
     axis2_char_t *mime_id,
     axis2_char_t *mime_type,
     axis2_char_t *mime_binary,
-    int mime_binary_len,
+    size_t mime_binary_len,
     axis2_bool_t cached)
 {
     if(mime_parser->mime_parts_map)
@@ -1900,7 +1896,8 @@
                 encoded_mime_id = AXIS2_MALLOC(env->allocator, (sizeof(axis2_char_t))
* (strlen(
                     mime_id)));
                 memset(encoded_mime_id, 0, strlen(mime_id));
-                encoded_mime_id = axutil_url_encode(env, encoded_mime_id, mime_id, strlen(mime_id));
+                encoded_mime_id = axutil_url_encode(
+                    env, encoded_mime_id, mime_id, (int)strlen(mime_id));
                 if(!encoded_mime_id)
                 {
                     AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Mime Id encoding failed");
@@ -2103,13 +2100,13 @@
 axiom_mime_parser_cache_to_buffer(
     const axutil_env_t *env,
     axis2_char_t *buf,
-    int buf_len,
+    size_t buf_len,
     axiom_search_info_t *search_info,
     axiom_mime_parser_t *mime_parser)
 {
     axis2_char_t *data_buffer = NULL;
     axis2_char_t *temp_buf = NULL;
-    int mime_binary_len = 0;
+    size_t mime_binary_len = 0;
 
     temp_buf = (axis2_char_t *)search_info->handler;
     mime_binary_len = search_info->binary_size + buf_len;
@@ -2286,10 +2283,10 @@
 axiom_mime_parser_cache_to_file(
     const axutil_env_t* env,
     axis2_char_t *buf,
-    int buf_len,
+    size_t buf_len,
     void *handler)
 {
-    int len = 0;
+    size_t len = 0;
     FILE *fp = NULL;
 
     fp = (FILE *)handler;

Modified: webservices/axis2/trunk/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_text.c?rev=890650&r1=890649&r2=890650&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Tue Dec 15 05:36:33 2009
@@ -512,7 +512,7 @@
     else
     {
         axis2_char_t *data_handler_stream = NULL;
-        int data_handler_stream_size = 0;
+        size_t data_handler_stream_size = 0;
         if(om_text->data_handler)
         {
             int encoded_len = 0;
@@ -521,12 +521,12 @@
                 &data_handler_stream_size);
             if(data_handler_stream)
             {
-                encoded_len = axutil_base64_encode_len(data_handler_stream_size);
+                encoded_len = axutil_base64_encode_len((int)data_handler_stream_size);
                 encoded_str = AXIS2_MALLOC(env->allocator, encoded_len + 2);
                 if(encoded_str)
                 {
                     encoded_len = axutil_base64_encode(encoded_str, data_handler_stream,
-                        data_handler_stream_size);
+                        (int)data_handler_stream_size);
                     encoded_str[encoded_len] = '\0';
                     return encoded_str;
                 }



Mime
View raw message