Use size_t for buffer size

Change-Id: I7bf0dad5063003c69f17874d4df6b18869614114

diff --git a/bmp/mm_util_bmp.c b/bmp/mm_util_bmp.c
index b0e1f90..a20eeb6 100755 (executable)
--- a/bmp/mm_util_bmp.c
+++ b/bmp/mm_util_bmp.c
@@ -124,7 +124,7 @@ static int __read_bmp(mm_util_bmp_data *decoded, const char *filename, void *mem
        };
        bmp_result code;
        bmp_image bmp;
-       size_t size;
+       size_t size = 0;
        int res = MM_UTIL_ERROR_NONE;
        unsigned char *data = NULL;
 

diff --git a/bmp/test/mm_util_bmp_testsuite.c b/bmp/test/mm_util_bmp_testsuite.c
index cc0356d..3b2b3b7 100755 (executable)
--- a/bmp/test/mm_util_bmp_testsuite.c
+++ b/bmp/test/mm_util_bmp_testsuite.c
@@ -234,7 +234,7 @@ gboolean _test_decode(const bmp_test_mode_e mode)
                        return FALSE;
                }
 
-               ret = mm_util_decode_from_bmp_memory(g_readed_data, (unsigned int)g_readed_size, &g_decoded_data);
+               ret = mm_util_decode_from_bmp_memory(g_readed_data, g_readed_size, &g_decoded_data);
                if (ret != MM_UTIL_ERROR_NONE) {
                        fprintf(stderr, "\t[BMP_testsuite] mm_util_decode_from_bmp_memory failed %d\n", ret);
                        return FALSE;

diff --git a/gif/include/mm_util_gif.h b/gif/include/mm_util_gif.h
index af60111..5d51625 100755 (executable)
--- a/gif/include/mm_util_gif.h
+++ b/gif/include/mm_util_gif.h
@@ -41,7 +41,7 @@ extern "C" {
  * Read data attached to decoding callback
  */
 typedef struct {
-       unsigned long long size;
+       size_t size;
        void *mem;
 } read_data;
 
@@ -49,7 +49,7 @@ typedef struct {
  * Write data attached to encoding callback
  */
 typedef struct {
-       unsigned long size;
+       size_t size;
        void **mem;
 } write_data;
 
@@ -101,7 +101,7 @@ typedef void* mm_gif_file_h;
 typedef struct {
        unsigned long width;                      /**< Width */
        unsigned long height;                     /**< Height */
-       unsigned long long size;                  /**< Size */
+       size_t size;              /**< Size */
        unsigned int image_count;                 /**< ImageCount */
        gboolean screen_desc_updated;             /**< Check if screen description is updated */
        unsigned int current_count;               /**< ImageCount */
@@ -303,7 +303,7 @@ int mm_util_gif_encode_set_file(mm_gif_file_h gif_file_h, const char *file_name)
  * @see                                        mm_util_gif_encode_create
  * @pre                                        mm_util_gif_encode_create
  */
-int mm_util_gif_encode_set_mem(mm_gif_file_h gif_file_h, void **data, unsigned long *data_size);
+int mm_util_gif_encode_set_mem(mm_gif_file_h gif_file_h, void **data, size_t *data_size);
 
 /**
  * This function sets the resolution(width, height) for gif.

diff --git a/gif/include/mm_util_gif_private.h b/gif/include/mm_util_gif_private.h
index fc9d8cd..3fa2758 100755 (executable)
--- a/gif/include/mm_util_gif_private.h
+++ b/gif/include/mm_util_gif_private.h
@@ -51,7 +51,7 @@ typedef struct {
        GifFileType *GifFile;                     /**< GifFile opened */
        char *filename;
        void **enc_buffer;                        /**< Encoded output data attached to callback */
-       unsigned long *enc_buffer_size;
+       size_t *enc_buffer_size;
        unsigned char *buffer;
        write_data write_data_ptr;                /**< Encoded output data attached to callback */
        gboolean is_started;

diff --git a/gif/mm_util_gif.c b/gif/mm_util_gif.c
index f19801c..359544b 100755 (executable)
--- a/gif/mm_util_gif.c
+++ b/gif/mm_util_gif.c
@@ -75,7 +75,7 @@ static int __read_function(GifFileType *gft, GifByteType *data, int size)
 static int __read_gif(mm_util_gif_data *decoded, const char *filename, void *memory)
 {
        int ExtCode, i, j, Row, Col, Width, Height;
-       unsigned long Size;
+       size_t Size = 0;
        GifRecordType record_type;
        GifRowType *screen_buffer = NULL;
        GifFileType *GifFile;
@@ -543,7 +543,7 @@ int _gif_encode_move_to_file(const char *dst)
        return ret;
 }
 
-int _gif_encode_move_to_mem(const unsigned char *src, unsigned long src_size, void **dst, unsigned long *dst_size)
+int _gif_encode_move_to_mem(const unsigned char *src, size_t src_size, void **dst, size_t *dst_size)
 {
        unsigned char *buffer = NULL;
        mm_util_retvm_if(src == NULL || dst == NULL || dst_size == NULL, MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid parameter");
@@ -962,7 +962,7 @@ int mm_util_gif_encode_set_file(mm_gif_file_h gif_file_h, const char *file_name)
        return MM_UTIL_ERROR_NONE;
 }
 
-int mm_util_gif_encode_set_mem(mm_gif_file_h gif_file_h, void **data, unsigned long *data_size)
+int mm_util_gif_encode_set_mem(mm_gif_file_h gif_file_h, void **data, size_t *data_size)
 {
        gif_file_s *gif_file = (gif_file_s *)gif_file_h;
 

diff --git a/gif/test/mm_util_gif_testsuite.c b/gif/test/mm_util_gif_testsuite.c
index 33ffc3d..643b407 100755 (executable)
--- a/gif/test/mm_util_gif_testsuite.c
+++ b/gif/test/mm_util_gif_testsuite.c
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
        mm_gif_file_h gif_file = NULL;
        mm_gif_image_h gif_image = NULL;
        unsigned char *encoded_gif_mem = NULL;
-       unsigned long encoded_gif_size = 0;
+       size_t encoded_gif_size = 0;
 
        ret = mm_util_gif_encode_create(&gif_file);
        fprintf(stderr, "\t mm_util_gif_enc_create [%d]\n", ret);

diff --git a/png/test/mm_util_png_testsuite.c b/png/test/mm_util_png_testsuite.c
index eaafeb4..6b8a156 100755 (executable)
--- a/png/test/mm_util_png_testsuite.c
+++ b/png/test/mm_util_png_testsuite.c
@@ -239,7 +239,7 @@ gboolean _test_decode(const png_test_mode_e mode)
                        return FALSE;
                }
 
-               ret = mm_util_decode_from_png_memory(g_readed_data, (unsigned long long)g_readed_size, &g_decoded_data);
+               ret = mm_util_decode_from_png_memory(g_readed_data, g_readed_size, &g_decoded_data);
                if (ret != MM_UTIL_ERROR_NONE) {
                        fprintf(stderr, "\t[PNG_testsuite] mm_util_decode_from_png_memory failed %d\n", ret);
                        return FALSE;