From 26a4b98ab005dbfcc67f746d709d3b1dfee18e33 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Mon, 26 Nov 2012 16:45:04 +0100
Subject: [PATCH] client: small cleanup

---
 gst/rtsp-server/rtsp-client.c | 11 +++++------
 gst/rtsp-server/rtsp-client.h |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c
index db37e1e..76c53da 100644
--- a/gst/rtsp-server/rtsp-client.c
+++ b/gst/rtsp-server/rtsp-client.c
@@ -175,7 +175,7 @@ gst_rtsp_client_init (GstRTSPClient * client)
 {
   g_mutex_init (&client->lock);
   client->use_client_settings = DEFAULT_USE_CLIENT_SETTINGS;
-  client->close_response_seq = 0;
+  client->close_seq = 0;
 }
 
 static void
@@ -329,7 +329,7 @@ send_response (GstRTSPClient * client, GstRTSPSession * session,
   /* send the response and store the seq number so we can wait until it's
    * written to the client to close the connection */
   gst_rtsp_watch_send_message (client->watch, response, close ?
-      &client->close_response_seq : NULL);
+      &client->close_seq : NULL);
   gst_rtsp_message_unset (response);
 }
 
@@ -1917,11 +1917,10 @@ message_received (GstRTSPWatch * watch, GstRTSPMessage * message,
 static GstRTSPResult
 message_sent (GstRTSPWatch * watch, guint cseq, gpointer user_data)
 {
-  GstRTSPClient *client;
+  GstRTSPClient *client = GST_RTSP_CLIENT (user_data);
 
-  client = GST_RTSP_CLIENT (user_data);
-  if (client->close_response_seq && client->close_response_seq == cseq) {
-    client->close_response_seq = 0;
+  if (client->close_seq && client->close_seq == cseq) {
+    client->close_seq = 0;
     close_connection (client);
   }
 
diff --git a/gst/rtsp-server/rtsp-client.h b/gst/rtsp-server/rtsp-client.h
index e91f817..5cf7b14 100644
--- a/gst/rtsp-server/rtsp-client.h
+++ b/gst/rtsp-server/rtsp-client.h
@@ -77,7 +77,7 @@ struct _GstRTSPClientState {
  * @lock: lock protecting the client object
  * @connection: the connection object handling the client request.
  * @watch: watch for the connection
- * @close_response_seq: sequence number of message with close header
+ * @close_seq: sequence number of message with close header
  * @server_ip: ip address of the server
  * @is_ipv6: if we are IPv6
  * @use_client_settings: whether to allow client transport settings for multicast
@@ -97,7 +97,7 @@ struct _GstRTSPClient {
   GMutex             lock;
   GstRTSPConnection *connection;
   GstRTSPWatch      *watch;
-  guint              close_response_seq;
+  guint              close_seq;
   gchar             *server_ip;
   gboolean           is_ipv6;
   gboolean           use_client_settings;
-- 
2.7.4