Remove duplicated memory setting

[platform/core/api/media-content.git] / include / media_info_private.h

diff --git a/include/media_info_private.h b/include/media_info_private.h
index f0f6ea0..07b5a6f 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -56,7 +56,7 @@ extern "C" {
 
 #define LOG_TAG "CAPI_CONTENT_MEDIA_CONTENT"
 
-#define SAFE_STRLCPY(dst, src, n)      ((g_strlcpy(dst, src, n) < n) ? TRUE : FALSE)
+#define SAFE_STRLCPY(dst, src, n)      g_strlcpy(dst, src, n);
 #define SAFE_STRLCAT(dst, src, n)      g_strlcat(dst, src, n);
 #define SAFE_FREE(src)         {if (src) {free(src); src = NULL; } }
 #define STRING_VALID(str)              ((str != NULL && strlen(str) > 0) ? TRUE : FALSE)
@@ -552,54 +552,60 @@ int _media_filter_build_option(filter_h filter, char **result);
 
 #define media_content_gettid() syscall(__NR_gettid)
 
-#define media_content_retv_if(expr, val) do { \
+#define content_retv_if(expr, val) do { \
                        if (expr) { \
                                LOGE(FONT_COLOR_RED"[%ld]"FONT_COLOR_RESET, media_content_gettid());    \
                                return (val); \
                        } \
                } while (0)
 
-#define media_content_retvm_if(expr, val, fmt, arg...) do { \
+#define content_retvm_if(expr, val, fmt, arg...) do { \
                        if (expr) { \
                                LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                                return (val); \
                        } \
                } while (0)
 
-#define media_content_warn(fmt, arg...) do { \
+#define content_retip_if_fail(expr) do { \
+                       if (!(expr)) { \
+                               LOGE(FONT_COLOR_RED"[%ld] Invalid [%s]"FONT_COLOR_RESET, media_content_gettid(), #expr);        \
+                               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; \
+                       } \
+               } while (0)
+
+#define content_retipm_if_fail(expr, fmt, arg...) do { \
+                       if (!(expr)) { \
+                               LOGE(FONT_COLOR_RED"[%ld] Cond[%s] value["fmt"]"FONT_COLOR_RESET, media_content_gettid(), #expr, ##arg); \
+                               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; \
+                       } \
+               } while (0)
+
+#define content_warn(fmt, arg...) do { \
                        LOGW(FONT_COLOR_GREEN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_debug(fmt, arg...) do { \
+#define content_debug(fmt, arg...) do { \
                        LOGD(FONT_COLOR_RESET"[%ld]"fmt"", media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_info(fmt, arg...) do { \
+#define content_info(fmt, arg...) do { \
                        LOGI(FONT_COLOR_GREEN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_error(fmt, arg...) do { \
+#define content_error(fmt, arg...) do { \
                        LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_debug_func() do { \
-                       LOGD(FONT_COLOR_RESET"[%ld]", media_content_gettid());     \
-               } while (0)
-
-#define media_content_sec_debug(fmt, arg...) do { \
+#define content_sec_debug(fmt, arg...) do { \
                        SECURE_LOGD(FONT_COLOR_CYAN"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
-#define media_content_sec_warn(fmt, arg...) do { \
-                       SECURE_LOGW(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
-               } while (0)
-
-#define media_content_sec_error(fmt, arg...) do { \
+#define content_sec_error(fmt, arg...) do { \
                        SECURE_LOGE(FONT_COLOR_RED"[%ld]"fmt""FONT_COLOR_RESET, media_content_gettid(), ##arg);     \
                } while (0)
 
 #define ERR_BUF_LENGTH 256
-#define media_content_stderror(fmt) do { \
+#define content_stderror(fmt) do { \
                        char media_content_stderror_buf[ERR_BUF_LENGTH] = {0, }; \
                        strerror_r(errno, media_content_stderror_buf, ERR_BUF_LENGTH);  \
                        LOGE(FONT_COLOR_RED fmt" : STANDARD ERROR [%s]"FONT_COLOR_RESET, media_content_stderror_buf); \