Remove out of memory related code by using glib APIs

[platform/core/api/media-content.git] / src / media_image.c

diff --git a/src/media_image.c b/src/media_image.c
index aa77ac3..11eb91a 100755 (executable)
--- a/src/media_image.c
+++ b/src/media_image.c
@@ -22,11 +22,11 @@ int image_meta_destroy(image_meta_h image)
        image_meta_s *_image = (image_meta_s*)image;
        content_retvm_if(_image == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Image handle is null");
 
-       SAFE_FREE(_image->media_id);
-       SAFE_FREE(_image->date_taken);
-       SAFE_FREE(_image->exposure_time);
-       SAFE_FREE(_image->model);
-       SAFE_FREE(_image);
+       g_free(_image->media_id);
+       g_free(_image->date_taken);
+       g_free(_image->exposure_time);
+       g_free(_image->model);
+       g_free(_image);
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -34,10 +34,11 @@ int image_meta_destroy(image_meta_h image)
 int image_meta_clone(image_meta_h *dst, image_meta_h src)
 {
        image_meta_s *_src = (image_meta_s*)src;
-       content_retvm_if(!_src, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Source handle is null");
 
-       image_meta_s *_dst = (image_meta_s*)calloc(1, sizeof(image_meta_s));
-       content_retvm_if(!_dst, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+       content_retip_if_fail(dst);
+       content_retip_if_fail(src);
+
+       image_meta_s *_dst = g_new0(image_meta_s, 1);
 
        _dst->media_id = g_strdup(_src->media_id);
        _dst->date_taken = g_strdup(_src->date_taken);
@@ -57,7 +58,9 @@ int image_meta_clone(image_meta_h *dst, image_meta_h src)
 int image_meta_get_media_id(image_meta_h image, char **media_id)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !media_id, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(media_id);
 
        *media_id = g_strdup(_image->media_id);
 
@@ -96,7 +99,9 @@ int image_meta_get_orientation(image_meta_h image, media_content_orientation_e*
 int image_meta_get_date_taken(image_meta_h image, char **date_taken)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !date_taken, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(date_taken);
 
        *date_taken = g_strdup(_image->date_taken);
 
@@ -106,7 +111,9 @@ int image_meta_get_date_taken(image_meta_h image, char **date_taken)
 int image_meta_get_exposure_time(image_meta_h image, char **exposure_time)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !exposure_time, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(exposure_time);
 
        *exposure_time = g_strdup(_image->exposure_time);
 
@@ -136,7 +143,9 @@ int image_meta_get_iso(image_meta_h image, int *iso)
 int image_meta_get_model(image_meta_h image, char **model)
 {
        image_meta_s *_image = (image_meta_s*)image;
-       content_retvm_if(!_image || !model, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid parameter");
+
+       content_retip_if_fail(image);
+       content_retip_if_fail(model);
 
        *model = g_strdup(_image->model);
 
@@ -169,7 +178,7 @@ int image_meta_update_to_db(image_meta_h image)
                ret = _media_db_get_storage_id_by_media_id(_image->media_id, &storage_id);
                content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
                sql = sqlite3_mprintf(UPDATE_IMAGE_META_FROM_MEDIA, storage_id, _image->orientation, _image->media_id);
-               SAFE_FREE(storage_id);
+               g_free(storage_id);
 #else
                sql = sqlite3_mprintf(UPDATE_IMAGE_META_FROM_MEDIA, _image->orientation, _image->media_id);
 #endif