Fix return type

Delete unreached code

[Version] 1.6.1 - 2
[Profile] Common
[Issue Type] Bug fix
[Dependency module] N/A
[Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-mobile_20161111.1]

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: Iea325ad74b7b31216c502068b18df2f5163b4b1c

diff --git a/gst/rtsp-server/rtsp-client-ext.c b/gst/rtsp-server/rtsp-client-ext.c
old mode 100755 (executable)
new mode 100644 (file)
index 5f73c99..6c41344
--- a/gst/rtsp-server/rtsp-client-ext.c
+++ b/gst/rtsp-server/rtsp-client-ext.c
@@ -372,7 +372,7 @@ handle_ext_stats (GstRTSPWFDClient * client, GstStructure * stats)
   GstRTSPExtClientPrivate *priv = GST_RTSP_EXT_CLIENT_GET_PRIVATE (_client);
   guint latest_resend_packets = 0;
 
-  g_return_val_if_fail (priv != NULL, FALSE);
+  g_return_if_fail (priv != NULL);
 
   latest_resend_packets = gst_rtsp_media_ext_get_resent_packets (priv->media);
 
@@ -552,7 +552,7 @@ handle_ext_m3_req_msg (GstRTSPWFDClient * client, gchar * data)
   GstWFDResult wfd_res = GST_WFD_EINVAL;
   gboolean is_appended = FALSE;
 
-  g_return_if_fail (client != NULL);
+  g_return_val_if_fail (client != NULL, NULL);
   g_return_val_if_fail (data != NULL, NULL);
 
   sink_user_agent = gst_rtsp_wfd_client_get_sink_user_agent (client);
@@ -637,7 +637,7 @@ handle_ext_m3_res_msg (GstRTSPWFDClient * client, gchar * data)
   GstWFDResult wfd_res = GST_WFD_EINVAL;
 
   g_return_if_fail (ext_priv != NULL);
-  g_return_val_if_fail (data != NULL, NULL);
+  g_return_if_fail (data != NULL);
 
   wfd_res = gst_wfd_ext_message_new (&msg);
   if (wfd_res != GST_WFD_OK) {
@@ -811,7 +811,7 @@ handle_ext_set_param_msg (GstRTSPWFDClient * client, gchar * data)
   GstRTSPExtClientPrivate *priv = GST_RTSP_EXT_CLIENT_GET_PRIVATE (client);
 
   g_return_if_fail (priv != NULL);
-  g_return_val_if_fail (data != NULL, NULL);
+  g_return_if_fail (data != NULL);
 
   return;
 }
@@ -823,9 +823,8 @@ handle_ext_m4_req_msg (GstRTSPWFDClient * client, gchar * data)
   gchar *tmp = NULL;
   GstRTSPExtClientPrivate *ext_priv = GST_RTSP_EXT_CLIENT_GET_PRIVATE (client);
   GstWFDResult wfd_res = GST_WFD_EINVAL;
-  gboolean is_appended = FALSE;
 
-  g_return_if_fail (ext_priv != NULL);
+  g_return_val_if_fail (ext_priv != NULL, NULL);
   g_return_val_if_fail (data != NULL, NULL);
 
   wfd_res = gst_wfd_ext_message_new (&msg);
@@ -893,7 +892,6 @@ handle_ext_m4_req_msg (GstRTSPWFDClient * client, gchar * data)
   if (tmp) {
     data = g_strconcat (data, tmp, NULL);
     g_free (tmp);
-    is_appended = TRUE;
   } else {
     GST_ERROR_OBJECT (client, "Failed to gst_wfd_ext_message_as_text");
     goto error;
@@ -904,16 +902,9 @@ handle_ext_m4_req_msg (GstRTSPWFDClient * client, gchar * data)
 
   gst_wfd_ext_listen_media_constructed (client);
 
-  if (is_appended == FALSE) {
-    return NULL;
-  } else {
-    return data;
-  };
-
   return data;
+
 error:
-  if (tmp != NULL)
-    g_free (tmp);
 
   if (msg != NULL)
     gst_wfd_ext_message_free (msg);

diff --git a/gst/rtsp-server/rtsp-media-ext.c b/gst/rtsp-server/rtsp-media-ext.c
old mode 100755 (executable)
new mode 100644 (file)
index abecb86..d1d2ebe
--- a/gst/rtsp-server/rtsp-media-ext.c
+++ b/gst/rtsp-server/rtsp-media-ext.c
@@ -571,7 +571,7 @@ ext_preparing (GstRTSPMedia * media, GstRTSPStream * stream, guint idx)
   GstRTSPMediaExtPrivate *priv;
 
   priv = _media->priv;
-  g_return_val_if_fail (priv != NULL, 0);
+  g_return_if_fail (priv != NULL);
 
   pipeline = gst_rtsp_media_get_pipeline (media);
   rtpbin = gst_rtsp_media_get_rtpbin (media);
@@ -666,7 +666,7 @@ ext_unpreparing (GstRTSPMedia * media, GstRTSPStream * stream, guint idx)
   GstRTSPMediaExtPrivate *priv;
 
   priv = _media->priv;
-  g_return_val_if_fail (priv != NULL, 0);
+  g_return_if_fail (priv != NULL);
 
   pipeline = gst_rtsp_media_get_pipeline (media);
   rtpbin = gst_rtsp_media_get_rtpbin (media);
@@ -720,10 +720,10 @@ gst_rtsp_media_ext_set_retrans_port (GstRTSPMediaExt * media, guint port)
 {
   GstRTSPMediaExtPrivate *priv;
 
-  g_return_val_if_fail (GST_IS_RTSP_MEDIA_EXT (media), 0);
+  g_return_if_fail (GST_IS_RTSP_MEDIA_EXT (media));
 
   priv = media->priv;
-  g_return_val_if_fail (priv != NULL, 0);
+  g_return_if_fail (priv != NULL);
 
   priv->retransmit_port = port;
 }
@@ -734,10 +734,10 @@ gst_rtsp_media_ext_set_fec_value (GstRTSPMediaExt * media, guint max_k,
 {
   GstRTSPMediaExtPrivate *priv;
 
-  g_return_val_if_fail (GST_IS_RTSP_MEDIA_EXT (media), 0);
+  g_return_if_fail (GST_IS_RTSP_MEDIA_EXT (media));
 
   priv = media->priv;
-  g_return_val_if_fail (priv != NULL, 0);
+  g_return_if_fail (priv != NULL);
 
   priv->max_size_k = max_k;
   priv->max_size_p = max_p;
@@ -749,10 +749,10 @@ gst_rtsp_media_ext_set_latency_mode (GstRTSPMediaExt * media,
 {
   GstRTSPMediaExtPrivate *priv;
 
-  g_return_val_if_fail (GST_IS_RTSP_MEDIA_EXT (media), 0);
+  g_return_if_fail (GST_IS_RTSP_MEDIA_EXT (media));
 
   priv = media->priv;
-  g_return_val_if_fail (priv != NULL, 0);
+  g_return_if_fail (priv != NULL);
 
   priv->latency_mode = latency;
 }
@@ -763,10 +763,10 @@ gst_rtsp_media_ext_set_next_param (GstRTSPMediaExt * media, gint32 next_k,
 {
   GstRTSPMediaExtPrivate *priv;
 
-  g_return_val_if_fail (GST_IS_RTSP_MEDIA_EXT (media), 0);
+  g_return_if_fail (GST_IS_RTSP_MEDIA_EXT (media));
 
   priv = media->priv;
-  g_return_val_if_fail (priv != NULL, 0);
+  g_return_if_fail (priv != NULL);
 
   g_object_set (G_OBJECT (priv->fecenc), "next-k", next_k, NULL);
   g_object_set (G_OBJECT (priv->fecenc), "next-p", next_p, NULL);

diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index 8f29da0..f79a457 100644 (file)
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -4185,7 +4185,7 @@ gst_rtsp_media_get_pipeline (GstRTSPMedia * media)
 {
   GstRTSPMediaPrivate *priv;
 
-  g_return_if_fail (GST_IS_RTSP_MEDIA (media));;
+  g_return_val_if_fail (GST_IS_RTSP_MEDIA (media), NULL);
 
   priv = media->priv;
 
@@ -4202,7 +4202,7 @@ gst_rtsp_media_get_rtpbin (GstRTSPMedia * media)
 {
   GstRTSPMediaPrivate *priv;
 
-  g_return_if_fail (GST_IS_RTSP_MEDIA (media));;
+  g_return_val_if_fail (GST_IS_RTSP_MEDIA (media), NULL);
 
   priv = media->priv;
 

diff --git a/packaging/gst-rtsp-server.spec b/packaging/gst-rtsp-server.spec
index 41b739c..f73387c 100644 (file)
--- a/packaging/gst-rtsp-server.spec
+++ b/packaging/gst-rtsp-server.spec
@@ -1,7 +1,7 @@
 Name:       gst-rtsp-server
 Summary:    Multimedia Framework Library
 Version:    1.6.1
-Release:    2
+Release:    3
 Url:        http://gstreamer.freedesktop.org/
 Group:      System/Libraries
 License:    LGPL-2.0+