Use do-while(0) statement for the macro checking argument

[Version] 0.6.9
[Issue Type] Improvement

Change-Id: If56b0d4839c3b7cec70f136281406bdd0cabd1d7
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/include/sound_manager_private.h b/include/sound_manager_private.h
index 1772cc0911344b4a1ded1fb6e3e764215e03e3c3..e772db5f7c99c19eb1d863f5df12c4100ce1494d 100644 (file)
--- a/include/sound_manager_private.h
+++ b/include/sound_manager_private.h
@@ -42,11 +42,12 @@ extern "C"
 #include "sound_manager_internal.h"
 
 #define _CHECK_CONDITION(condition, error, msg)     \
-if (condition) { \
-} else { \
-       LOGE("[%s] %s(0x%08x)", __FUNCTION__, msg, error); \
-       return error; \
-}; \
+do { \
+       if (!(condition)) { \
+               LOGE("[%s] %s(0x%08x)", __FUNCTION__, msg, error); \
+               return error; \
+       } \
+} while (0)
 
 #define SM_INSTANCE_CHECK(handle) \
 _CHECK_CONDITION(handle != NULL, SOUND_MANAGER_ERROR_INVALID_PARAMETER, "SOUND_MANAGER_ERROR_INVALID_PARAMETER")

diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec
index 944764eb734deeae2d76e38c2fff4315ec276cb6..0f203daa22f0e8dcde4ff0e9609c92c8f101a077 100644 (file)
--- a/packaging/capi-media-sound-manager.spec
+++ b/packaging/capi-media-sound-manager.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-sound-manager
 Summary:    Sound Manager library
-Version:    0.6.8
+Version:    0.6.9
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/sound_manager_private.c b/src/sound_manager_private.c
index 35544aca41694138810a6afa96fa77539fdfb8d2..0e0458d8d31ae3988a64e7af64c2725b194cf858 100644 (file)
--- a/src/sound_manager_private.c
+++ b/src/sound_manager_private.c
@@ -3336,7 +3336,7 @@ int _get_latest_stream_pid(int stream_type, unsigned int *pid)
        const gchar *dbus_ret = NULL;
        unsigned int _pid;
 
-       SM_NULL_ARG_CHECK_FOR_PRIV(pid)
+       SM_NULL_ARG_CHECK_FOR_PRIV(pid);
 
        if ((ret = __get_dbus_connection(&conn)))
                return ret;