Fix svace issue (UNREACHABLE_CODE)

[Version] 0.1.5
[Profile] Common, Mobile, Wearable, TV
[Issue Type] Fix svace issue

Change-Id: I24becf636af8f84009fc4a13236c3cd96b6e970b

diff --git a/include/mediamuxer_ini.h b/include/mediamuxer_ini.h
index 8a668aa..bc38960 100755 (executable)
--- a/include/mediamuxer_ini.h
+++ b/include/mediamuxer_ini.h
@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-#define MEDIAMUXER_INI_DEFAULT_PATH   "/usr/etc/mmfw_mediamuxer.ini"
+#define MEDIAMUXER_INI_DEFAULT_PATH   SYSCONFDIR"/multimedia/mmfw_mediamuxer.ini"
 #define MEDIAMUXER_INI_MAX_STRLEN     100
 #define DEFAULT_PORT "GST_PORT"
 

diff --git a/packaging/capi-mediamuxer.spec b/packaging/capi-mediamuxer.spec
index 17ede98..1b233ac 100755 (executable)
--- a/packaging/capi-mediamuxer.spec
+++ b/packaging/capi-mediamuxer.spec
@@ -42,6 +42,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %ifarch %{arm}
 export CFLAGS="$CFLAGS -DENABLE_FFMPEG_CODEC"
 %endif
+export CFLAGS="$CFLAGS -DSYSCONFDIR=\\\"%{_sysconfdir}\\\" "
 
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}

diff --git a/src/mediamuxer_ini.c b/src/mediamuxer_ini.c
index 1d52a73..20857a5 100644 (file)
--- a/src/mediamuxer_ini.c
+++ b/src/mediamuxer_ini.c
@@ -22,10 +22,10 @@
 #include <glib/gstdio.h>
 #include <mm_debug.h>
 #include <mm_error.h>
-#include "iniparser.h"
-#include <mediamuxer_ini.h>
-#include <mediamuxer_private.h>
-#include <mediamuxer_error.h>
+#include <iniparser.h>
+#include "mediamuxer_ini.h"
+#include "mediamuxer_private.h"
+#include "mediamuxer_error.h"
 
 /* macro */
 #define MEDIAMUXER_INI_GET_STRING(x_dict, x_item, x_ini, x_default) \

diff --git a/src/port_gst/mediamuxer_port_gst.c b/src/port_gst/mediamuxer_port_gst.c
index 5f5fe40..cbd9cbf 100755 (executable)
--- a/src/port_gst/mediamuxer_port_gst.c
+++ b/src/port_gst/mediamuxer_port_gst.c
@@ -1426,12 +1426,6 @@ int gst_muxer_set_error_cb(MMHandleType pHandle, gst_muxer_error_cb callback, vo
        MEDIAMUXER_CHECK_NULL(pHandle);
        mxgst_handle_t *gst_handle = (mxgst_handle_t *) pHandle;
 
-       if (!gst_handle) {
-               MX_E("fail invaild param\n");
-               ret = MX_INVALID_ARGUMENT;
-               goto ERROR;
-       }
-
        if (gst_handle->user_cb[_GST_EVENT_TYPE_ERROR]) {
                MX_E("Already set mediamuxer_error_cb\n");
                ret = MX_ERROR_INVALID_ARGUMENT;