From 786a6f347b8081ed76355ee8d98515adbfed0e97 Mon Sep 17 00:00:00 2001 From: "jiyong.min" Date: Mon, 10 Feb 2020 13:14:49 +0900 Subject: [PATCH] Remove g_free macro Change-Id: I7d477fdcecff5b3026dd2e68919aded5fc71d473 --- include/media_info_private.h | 1 - include_product/media_info_private.h | 1 - src/media_content.c | 2 +- src/media_info.c | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index 35c0261..fd12faa 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -59,7 +59,6 @@ extern "C" { #define SAFE_STRLCPY(dst, src, n) ((g_strlcpy(dst, src, n) < n) ? TRUE : FALSE) #define SAFE_STRLCAT(dst, src, n) g_strlcat(dst, src, n); #define SAFE_FREE(src) {if (src) {free(src); src = NULL; } } -#define SAFE_G_FREE(src) {if (src) {g_free(src); src = NULL; } } #define STRING_VALID(str) ((str != NULL && strlen(str) > 0) ? TRUE : FALSE) #define SQLITE3_FINALIZE(x) {if (x != NULL) sqlite3_finalize(x); } #define SQLITE3_SAFE_FREE(x) {if (x != NULL) {sqlite3_free(x); x = NULL; } } diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index 73e7f3f..e25cb0d 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -62,7 +62,6 @@ extern "C" { #define SAFE_STRLCPY(dst, src, n) ((g_strlcpy(dst, src, n) < n) ? TRUE : FALSE) #define SAFE_STRLCAT(dst, src, n) g_strlcat(dst, src, n); #define SAFE_FREE(src) {if (src) {free(src); src = NULL; } } -#define SAFE_G_FREE(src) {if (src) {g_free(src); src = NULL; } } #define STRING_VALID(str) ((str != NULL && strlen(str) > 0) ? TRUE : FALSE) #define SQLITE3_FINALIZE(x) {if (x != NULL) sqlite3_finalize(x); } #define SQLITE3_SAFE_FREE(x) {if (x != NULL) {sqlite3_free(x); x = NULL; } } diff --git a/src/media_content.c b/src/media_content.c index 1d5e4f1..e9e8d88 100644 --- a/src/media_content.c +++ b/src/media_content.c @@ -275,7 +275,7 @@ int media_content_scan_file(const char *path) /* This means this path has to be inserted or refreshed */ folder_path = g_path_get_dirname(repl_path); ret = _media_util_check_ignore_dir(folder_path, &ignore_dir); - SAFE_G_FREE(folder_path); + g_free(folder_path); media_content_retvm_if(ignore_dir == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path"); /* check feature */ diff --git a/src/media_info.c b/src/media_info.c index fcc137e..2c936b7 100644 --- a/src/media_info.c +++ b/src/media_info.c @@ -265,7 +265,7 @@ static int __media_info_check_file_validity(const char *path) folder_path = g_path_get_dirname(path); ret = _media_util_check_ignore_dir(folder_path, &ignore); - SAFE_G_FREE(folder_path); + g_free(folder_path); media_content_retvm_if(ignore == TRUE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid folder path"); return MEDIA_CONTENT_ERROR_NONE; -- 2.7.4