Use g_free directly and remove macro

Change-Id: I98388a5d62c19b8029a58adc94da83f924fa150e

diff --git a/common/include/mm_util_private.h b/common/include/mm_util_private.h
index 475ceb570665ceb00629c6c71a6c15e0ef33a28b..8c4f73e8e765b1c65d735c92c5367f5a845dc847 100644 (file)
--- a/common/include/mm_util_private.h
+++ b/common/include/mm_util_private.h
@@ -35,7 +35,6 @@ extern "C" {
 
 /* for memory management */
 #define MMUTIL_SAFE_FREE(x)                            { if (x) { free(x); x = NULL; } }
-#define MMUTIL_SAFE_G_FREE(x)                  { if (x) { g_free(x); x = NULL; } }
 #define MMUTIL_SAFE_STRCPY(dst, src, n)        g_strlcpy(dst, src, n)
 #define MMUTIL_STRING_VALID(str)       ((str != NULL && strlen(str) > 0) ? TRUE : FALSE)
 

diff --git a/gif/mm_util_gif.c b/gif/mm_util_gif.c
index 3cb4299686b8aced6e971ef9e4f186548b7c6379..63dd6886c57d1abe4ca1d2bd14d9589f30d72fcc 100644 (file)
--- a/gif/mm_util_gif.c
+++ b/gif/mm_util_gif.c
@@ -626,7 +626,6 @@ int mm_util_gif_encode_set_file(mm_gif_file_h gif_file_h, const char *file_path)
        mm_util_retvm_if(!MMUTIL_STRING_VALID(file_path), MM_UTIL_ERROR_INVALID_PARAMETER, "Invalid file_path");
 
        gif_file->filename = g_strdup(file_path);
-       mm_util_retvm_if(gif_file->filename == NULL, MM_UTIL_ERROR_OUT_OF_MEMORY, "Memory allocation failed");
 
        return MM_UTIL_ERROR_NONE;
 }
@@ -832,7 +831,7 @@ void mm_util_gif_encode_destroy(mm_gif_file_h gif_file_h)
                mm_util_retm_if(ret != MM_UTIL_ERROR_NONE, "__gif_encode_close_file failed");
        }
 
-       MMUTIL_SAFE_G_FREE(gif_file->filename);
+       g_free(gif_file->filename);
        MMUTIL_SAFE_FREE(gif_file->io_buf.buf);
        MMUTIL_SAFE_FREE(gif_file);
 }