[Pkg-telepathy-commits] [libnice] 228/265: conncheck: Remove useless return value on conn_check_prune_stream

Simon McVittie smcv at debian.org
Wed May 14 12:05:11 UTC 2014


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

smcv pushed a commit to branch debian
in repository libnice.

commit edcbc597322d167d72225d8d322fd5a73671e15f
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Thu Apr 24 20:31:44 2014 -0400

    conncheck: Remove useless return value on conn_check_prune_stream
---
 agent/conncheck.c | 8 +-------
 agent/conncheck.h | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/agent/conncheck.c b/agent/conncheck.c
index 8115d1b..d1cb4fa 100644
--- a/agent/conncheck.c
+++ b/agent/conncheck.c
@@ -1443,7 +1443,7 @@ void conn_check_free (NiceAgent *agent)
  *
  * @return TRUE on success, FALSE on a fatal error
  */
-gboolean conn_check_prune_stream (NiceAgent *agent, Stream *stream)
+void conn_check_prune_stream (NiceAgent *agent, Stream *stream)
 {
   CandidateCheckPair *pair;
   GSList *i;
@@ -1464,12 +1464,6 @@ gboolean conn_check_prune_stream (NiceAgent *agent, Stream *stream)
 
   if (!stream->conncheck_list)
     conn_check_free (agent);
-
-  /* return FALSE if there was a memory allocation failure */
-  if (stream->conncheck_list == NULL && i != NULL)
-    return FALSE;
-
-  return TRUE;
 }
 
 /*
diff --git a/agent/conncheck.h b/agent/conncheck.h
index 431bb55..e569f03 100644
--- a/agent/conncheck.h
+++ b/agent/conncheck.h
@@ -87,7 +87,7 @@ void conn_check_free_item (gpointer data, gpointer user_data);
 void conn_check_free (NiceAgent *agent);
 gboolean conn_check_schedule_next (NiceAgent *agent);
 int conn_check_send (NiceAgent *agent, CandidateCheckPair *pair);
-gboolean conn_check_prune_stream (NiceAgent *agent, Stream *stream);
+void conn_check_prune_stream (NiceAgent *agent, Stream *stream);
 gboolean conn_check_handle_inbound_stun (NiceAgent *agent, Stream *stream, Component *component, NiceSocket *udp_socket, const NiceAddress *from, gchar *buf, guint len);
 gint conn_check_compare (const CandidateCheckPair *a, const CandidateCheckPair *b);
 void conn_check_remote_candidates_set(NiceAgent *agent);

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



More information about the Pkg-telepathy-commits mailing list