[Pkg-telepathy-commits] [libnice] 244/265: discovery: Remove never used and leaked msn_turn_* fields in CandidateDiscovery

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit 3a90ff40fa9ff4ebb94e6514c46d6f6d70e1fdc8
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Tue Apr 22 16:47:36 2014 -0400

    discovery: Remove never used and leaked msn_turn_* fields in CandidateDiscovery
---
 agent/discovery.c | 9 +++------
 agent/discovery.h | 2 --
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/agent/discovery.c b/agent/discovery.c
index 516e2cc..7511d3d 100644
--- a/agent/discovery.c
+++ b/agent/discovery.c
@@ -76,8 +76,7 @@ void discovery_free_item (gpointer data, gpointer user_data)
 {
   CandidateDiscovery *cand = data;
   g_assert (user_data == NULL);
-  g_free (cand->msn_turn_username);
-  g_free (cand->msn_turn_password);
+
   g_slice_free (CandidateDiscovery, cand);
 }
 
@@ -888,10 +887,8 @@ static gboolean priv_discovery_tick_unlocked (gpointer pointer)
 
           if (turn_compat == STUN_USAGE_TURN_COMPATIBILITY_MSN ||
               turn_compat == STUN_USAGE_TURN_COMPATIBILITY_OC2007) {
-            g_free (cand->msn_turn_username);
-            g_free (cand->msn_turn_password);
-            cand->msn_turn_username = username;
-            cand->msn_turn_password = password;
+            g_free (username);
+            g_free (password);
           }
         }
 
diff --git a/agent/discovery.h b/agent/discovery.h
index 973702e..5a12a8c 100644
--- a/agent/discovery.h
+++ b/agent/discovery.h
@@ -57,8 +57,6 @@ typedef struct
   Component *component;
   TurnServer *turn;
   StunAgent stun_agent;
-  uint8_t *msn_turn_username;
-  uint8_t *msn_turn_password;
   StunTimer timer;
   uint8_t stun_buffer[STUN_MAX_MESSAGE_SIZE];
   StunMessage stun_message;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git