From: Sangchul Lee <sangchul1011@gmail.com>
Date: Tue, 5 Jan 2021 02:55:00 +0000 (+0900)
Subject: Improve macros for checking condition
X-Git-Tag: submit/tizen/20210108.020109~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F250813%2F1;p=platform%2Fcore%2Fapi%2Fmediatool.git

Improve macros for checking condition

Use do-while.
Remove empty if statement.

[Version] 0.1.28
[Issue Type] Refactoring

Change-Id: Idf23e60c01c72bf70b7986701468d5e895f4982e
Signed-off-by: Sangchul Lee <sangchul1011@gmail.com>
---

diff --git a/include/media_format_private.h b/include/media_format_private.h
index fecc2d3..e6cb0bc 100644
--- a/include/media_format_private.h
+++ b/include/media_format_private.h
@@ -30,12 +30,20 @@ extern "C" {
 #define LOG_TAG "TIZEN_MEDIA_TOOL"
 
 #define MEDIA_FORMAT_CHECK_CONDITION(condition, error, msg)     \
-	if (condition) {} else \
-	{ LOGE("%s(0x%08x)", msg, error); return error; };
+do { \
+	if (!(condition)) { \
+		LOGE("%s(0x%08x)", msg, error); \
+		return error; \
+	} \
+} while (0)
 
 #define MEDIA_FORMAT_CHECK_CONDITION_VOID(condition, msg)     \
-	if (condition) {} else \
-	{ LOGE("%s", msg); return; };
+do { \
+	if (!(condition)) { \
+		LOGE("%s", msg); \
+		return; \
+	} \
+} while (0)
 
 
 #define MEDIA_FORMAT_INSTANCE_CHECK(media_format)   \
diff --git a/include/media_packet_pool_private.h b/include/media_packet_pool_private.h
index a082d22..057d533 100644
--- a/include/media_packet_pool_private.h
+++ b/include/media_packet_pool_private.h
@@ -32,8 +32,12 @@ extern "C" {
 #define MAX_PACKET	25
 
 #define MEDIA_PACKET_POOL_CHECK_CONDITION(condition, error, msg)     \
-	if (condition) {} else \
-	{ LOGE("%s(0x%08x)", msg, error); return error; };
+do { \
+	if (!(condition)) { \
+		LOGE("%s(0x%08x)", msg, error); \
+		return error; \
+	} \
+} while (0)
 
 #define MEDIA_PACKET_POOL_INSTANCE_CHECK(pool)   \
 	MEDIA_PACKET_POOL_CHECK_CONDITION(pool != NULL, MEDIA_PACKET_ERROR_INVALID_PARAMETER, "MEDIA_PACKET_ERROR_INVALID_PARAMETER")
diff --git a/include/media_packet_private.h b/include/media_packet_private.h
index 0ef6bd0..aab463a 100644
--- a/include/media_packet_private.h
+++ b/include/media_packet_private.h
@@ -30,8 +30,12 @@ extern "C" {
 #define LOG_TAG "TIZEN_MEDIA_TOOL"
 
 #define MEDIA_PACKET_CHECK_CONDITION(condition, error, msg)     \
-	if (condition) {} else \
-	{ LOGE("%s(0x%08x)", msg, error); return error; };
+do { \
+	if (!(condition)) { \
+		LOGE("%s(0x%08x)", msg, error); \
+		return error; \
+	} \
+} while (0)
 
 #define MEDIA_PACKET_INSTANCE_CHECK(media_packet)   \
 	MEDIA_PACKET_CHECK_CONDITION(media_packet != NULL, MEDIA_PACKET_ERROR_INVALID_PARAMETER, "MEDIA_PACKET_ERROR_INVALID_PARAMETER")
diff --git a/packaging/capi-media-tool.spec b/packaging/capi-media-tool.spec
index 7ff7582..2fa979f 100755
--- a/packaging/capi-media-tool.spec
+++ b/packaging/capi-media-tool.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-tool
 Summary:    A Core API media tool library in Tizen Native API
-Version:    0.1.27
+Version:    0.1.28
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0