[farsight2/master] Don't set the errors to NULL without checking them

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:19:23 PST 2008


---
 gst-libs/gst/farsight/fs-session.c            |    4 ----
 gst-libs/gst/farsight/fs-stream-transmitter.c |    2 --
 gst-libs/gst/farsight/fs-stream.c             |    4 ----
 transmitters/rawudp/fs-rawudp-transmitter.c   |    2 --
 4 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index 655a8b8..66ac987 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -430,8 +430,6 @@ fs_session_new_stream (FsSession *session, FsParticipant *participant,
   g_return_val_if_fail (g_type_is_a (G_OBJECT_TYPE (session),
               FS_TYPE_SESSION), NULL);
 
-  *error = NULL;
-
   if (klass->new_stream) {
     new_stream = klass->new_stream (session, participant, direction,
                                     transmitter, error);
@@ -536,8 +534,6 @@ fs_session_set_send_codec (FsSession *session, FsCodec *send_codec,
 {
   FsSessionClass *klass = FS_SESSION_GET_CLASS (session);
 
-  *error = NULL;
-
   if (klass->set_send_codec) {
     return klass->set_send_codec (session, send_codec, error);
   } else {
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.c b/gst-libs/gst/farsight/fs-stream-transmitter.c
index 99e724e..61edf27 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.c
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.c
@@ -308,8 +308,6 @@ fs_stream_transmitter_add_remote_candidate (
   FsStreamTransmitterClass *klass =
     FS_STREAM_TRANSMITTER_GET_CLASS (streamtransmitter);
 
-  *error = NULL;
-
   if (klass->add_remote_candidate) {
     return klass->add_remote_candidate (streamtransmitter, candidate, error);
   } else {
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index e7da6e4..f821632 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -559,8 +559,6 @@ fs_stream_preload_recv_codec (FsStream *stream, FsCodec *codec, GError **error)
 {
   FsStreamClass *klass = FS_STREAM_GET_CLASS (stream);
 
-  *error = NULL;
-
   if (klass->preload_recv_codec) {
     return klass->preload_recv_codec (stream, codec, error);
   } else {
@@ -590,8 +588,6 @@ fs_stream_set_remote_codecs (FsStream *stream,
 {
   FsStreamClass *klass = FS_STREAM_GET_CLASS (stream);
 
-  *error = NULL;
-
   if (klass->set_remote_codecs) {
     return klass->set_remote_codecs (stream, remote_codecs, error);
   } else {
diff --git a/transmitters/rawudp/fs-rawudp-transmitter.c b/transmitters/rawudp/fs-rawudp-transmitter.c
index 72c61aa..c4057b8 100644
--- a/transmitters/rawudp/fs-rawudp-transmitter.c
+++ b/transmitters/rawudp/fs-rawudp-transmitter.c
@@ -545,8 +545,6 @@ fs_rawudp_transmitter_get_udpstream (FsRawUdpTransmitter *trans,
   UdpStream *udpstream;
   GList *udpstream_e;
 
-  *error = NULL;
-
   /* First lets check if we already have one */
 
   for (udpstream_e = g_list_first (trans->priv->udpstreams);
-- 
1.5.6.5




More information about the farsight-commits mailing list