From 92a2a6174cfb9694f4386af8d79bde409551ab23 Mon Sep 17 00:00:00 2001
From: SeokHoon Lee <andy.shlee@samsung.com>
Date: Wed, 6 Dec 2017 10:49:04 +0900
Subject: [PATCH] Change define FREE_STRING

- FREE_STRING change to do  { }while(0)
- delete unused define

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I1117a19f72bf3691662fb4c3a4e0627b6e0f9277
---
 gst/rtsp-server/gstwfdmessage-ext.c | 13 ++++--------
 gst/rtsp-server/gstwfdmessage.c     | 40 +++++++++++++------------------------
 packaging/gst-rtsp-server.spec      |  2 +-
 3 files changed, 19 insertions(+), 36 deletions(-)
 mode change 100755 => 100644 gst/rtsp-server/gstwfdmessage-ext.c

diff --git a/gst/rtsp-server/gstwfdmessage-ext.c b/gst/rtsp-server/gstwfdmessage-ext.c
old mode 100755
new mode 100644
index d7d1ed4..73ce8b1
--- a/gst/rtsp-server/gstwfdmessage-ext.c
+++ b/gst/rtsp-server/gstwfdmessage-ext.c
@@ -64,8 +64,7 @@
 
 #include "gstwfdmessage-ext.h"
 
-#define FREE_STRING(field)              g_free (field); (field) = NULL
-#define REPLACE_STRING(field, val)      FREE_STRING(field); (field) = g_strdup (val)
+#define FREE_STRING(field)              do { g_free (field); (field) = NULL; } while(0)
 
 G_DEFINE_BOXED_TYPE (GstWFDExtMessage, gst_wfd_ext_message, NULL, NULL);
 
@@ -127,17 +126,14 @@ gst_wfd_ext_message_uninit (GstWFDExtMessage * msg)
 {
   g_return_val_if_fail (msg != NULL, GST_WFD_EINVAL);
 
-  if (msg->tizen_retransmission) {
+  if (msg->tizen_retransmission)
     FREE_STRING (msg->tizen_retransmission);
-  }
 
-  if (msg->tizen_fec) {
+  if (msg->tizen_fec)
     FREE_STRING (msg->tizen_fec);
-  }
 
-  if (msg->tizen_latency_mode) {
+  if (msg->tizen_latency_mode)
     FREE_STRING (msg->tizen_latency_mode);
-  }
 
   return GST_WFD_OK;
 }
@@ -204,7 +200,6 @@ gst_wfd_parse_attribute (gchar * buffer, GstWFDExtMessage * msg)
 #define WFD_SKIP_SPACE(q) if (*q && g_ascii_isspace (*q)) q++
 #define WFD_SKIP_EQUAL(q) if (*q && *q == '=') q++
 #define WFD_SKIP_COMMA(q) if (*q && g_ascii_ispunct (*q)) q++
-#define WFD_READ_STRING(field) _read_string_space_ended (temp, sizeof (temp), v); v+=strlen(temp); REPLACE_STRING (field, temp)
 #define WFD_READ_UINT32(field) _read_string_space_ended (temp, sizeof (temp), v); v+=strlen(temp); field = strtoul (temp, NULL, 16)
 #define WFD_READ_UINT32_DIGIT(field) _read_string_space_ended (temp, sizeof (temp), v); v+=strlen(temp); field = strtoul (temp, NULL, 10)
 
diff --git a/gst/rtsp-server/gstwfdmessage.c b/gst/rtsp-server/gstwfdmessage.c
index 50c5f3d..6a52c06 100644
--- a/gst/rtsp-server/gstwfdmessage.c
+++ b/gst/rtsp-server/gstwfdmessage.c
@@ -68,8 +68,8 @@
 #define EDID_BLOCK_COUNT_MAX_SIZE 256
 #define MAX_PORT_SIZE 65535
 
-#define FREE_STRING(field)              g_free (field); (field) = NULL
-#define REPLACE_STRING(field, val)      FREE_STRING(field); (field) = g_strdup (val)
+#define FREE_STRING(field)              do { g_free (field); (field) = NULL; } while(0)
+#define REPLACE_STRING(field, val)      do { FREE_STRING(field); (field) = g_strdup (val); } while(0)
 
 #define INIT_ARRAY(field, type, init_func)              \
 G_STMT_START {                                          \
@@ -325,53 +325,41 @@ gst_wfd_message_uninit (GstWFDMessage * msg)
     FREE_STRING (msg->route);
   }
 
-  if (msg->I2C) {
+  if (msg->I2C)
     FREE_STRING (msg->I2C);
-  }
 
-  if (msg->av_format_change_timing) {
+  if (msg->av_format_change_timing)
     FREE_STRING (msg->av_format_change_timing);
-  }
 
-  if (msg->preferred_display_mode) {
+  if (msg->preferred_display_mode)
     FREE_STRING (msg->preferred_display_mode);
-  }
 
-  if (msg->standby_resume_capability) {
+  if (msg->standby_resume_capability)
     FREE_STRING (msg->standby_resume_capability);
-  }
 
-  if (msg->standby) {
+  if (msg->standby)
     FREE_STRING (msg->standby);
-  }
 
-  if (msg->connector_type) {
+  if (msg->connector_type)
     FREE_STRING (msg->connector_type);
-  }
 
-  if (msg->idr_request) {
+  if (msg->idr_request)
     FREE_STRING (msg->idr_request);
-  }
 
-  if (msg->direct_mode) {
+  if (msg->direct_mode)
     FREE_STRING(msg->direct_mode);
-  }
 
-  if (msg->tcp_ports) {
+  if (msg->tcp_ports)
     FREE_STRING(msg->tcp_ports);
-  }
 
-  if (msg->buf_len) {
+  if (msg->buf_len)
     FREE_STRING(msg->buf_len);
-  }
 
-  if (msg->audio_status) {
+  if (msg->audio_status)
     FREE_STRING(msg->audio_status);
-  }
 
-  if (msg->video_status) {
+  if (msg->video_status)
     FREE_STRING(msg->video_status);
-  }
 
   return GST_WFD_OK;
 }
diff --git a/packaging/gst-rtsp-server.spec b/packaging/gst-rtsp-server.spec
index baac768..ef994d6 100644
--- 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:    20
+Release:    21
 Url:        http://gstreamer.freedesktop.org/
 Group:      System/Libraries
 License:    LGPL-2.0+
-- 
2.7.4