From 83f072939434afb2c05302101c8288ddacbee26f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
Date: Sun, 4 May 2008 15:02:20 +0000
Subject: [PATCH] Remove some unused code.

Original commit message from CVS:
* gst-libs/gst/audio/gstaudiosink.c: (audioringbuffer_thread_func):
* gst-libs/gst/audio/gstaudiosrc.c: (audioringbuffer_thread_func):
* gst/tcp/gsttcp.c: (gst_tcp_socket_write):
* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_get_fps_list):
Remove some unused code.
* gst/audioconvert/gstaudioquantize.c:
(gst_audio_quantize_free_noise_shaping):
Don't return before freeing the noise shaping history.
---
 ChangeLog                           | 12 ++++++++++++
 gst-libs/gst/audio/gstaudiosink.c   |  2 +-
 gst-libs/gst/audio/gstaudiosrc.c    |  2 +-
 gst/audioconvert/gstaudioquantize.c |  1 -
 gst/tcp/gsttcp.c                    |  6 ++----
 sys/v4l/v4lsrc_calls.c              |  1 -
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3b936c88ae..553a2fbacd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-04  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* gst-libs/gst/audio/gstaudiosink.c: (audioringbuffer_thread_func):
+	* gst-libs/gst/audio/gstaudiosrc.c: (audioringbuffer_thread_func):
+	* gst/tcp/gsttcp.c: (gst_tcp_socket_write):
+	* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_get_fps_list):
+	Remove some unused code.
+
+	* gst/audioconvert/gstaudioquantize.c:
+	(gst_audio_quantize_free_noise_shaping):
+	Don't return before freeing the noise shaping history.
+
 2008-05-03  Tim-Philipp Müller  <tim.muller at collabora co uk>
 
 	* tests/check/elements/subparse.c: (do_test),
diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c
index f37bd55c4d..fd10b83b6b 100644
--- a/gst-libs/gst/audio/gstaudiosink.c
+++ b/gst-libs/gst/audio/gstaudiosink.c
@@ -255,8 +255,8 @@ audioringbuffer_thread_func (GstRingBuffer * buf)
       GST_OBJECT_UNLOCK (abuf);
     }
   }
-  GST_DEBUG_OBJECT (sink, "exit thread");
 
+  /* Will never be reached */
   return;
 
   /* ERROR */
diff --git a/gst-libs/gst/audio/gstaudiosrc.c b/gst-libs/gst/audio/gstaudiosrc.c
index 0b2459113b..2587035d6f 100644
--- a/gst-libs/gst/audio/gstaudiosrc.c
+++ b/gst-libs/gst/audio/gstaudiosrc.c
@@ -248,8 +248,8 @@ audioringbuffer_thread_func (GstRingBuffer * buf)
       GST_OBJECT_UNLOCK (abuf);
     }
   }
-  GST_DEBUG_OBJECT (src, "exit thread");
 
+  /* Will never be reached */
   return;
 
   /* ERROR */
diff --git a/gst/audioconvert/gstaudioquantize.c b/gst/audioconvert/gstaudioquantize.c
index 3dcb68e5ad..b6385985a5 100644
--- a/gst/audioconvert/gstaudioquantize.c
+++ b/gst/audioconvert/gstaudioquantize.c
@@ -430,7 +430,6 @@ gst_audio_quantize_free_noise_shaping (AudioConvertCtx * ctx)
     default:
       break;
   }
-  return;
 
   g_free (ctx->error_buf);
   ctx->error_buf = NULL;
diff --git a/gst/tcp/gsttcp.c b/gst/tcp/gsttcp.c
index 584a25ad3b..9bf2666d79 100644
--- a/gst/tcp/gsttcp.c
+++ b/gst/tcp/gsttcp.c
@@ -110,15 +110,13 @@ gst_tcp_socket_write (int socket, const void *buf, size_t count)
         count - bytes_written, MSG_NOSIGNAL);
 
     if (wrote <= 0) {
+      GST_WARNING ("error while writing");
       return bytes_written;
     }
     bytes_written += wrote;
   }
 
-  if (bytes_written < 0)
-    GST_WARNING ("error while writing");
-  else
-    GST_LOG ("wrote %" G_GSIZE_FORMAT " bytes succesfully", bytes_written);
+  GST_LOG ("wrote %" G_GSIZE_FORMAT " bytes succesfully", bytes_written);
   return bytes_written;
 }
 
diff --git a/sys/v4l/v4lsrc_calls.c b/sys/v4l/v4lsrc_calls.c
index 54bf55f856..c14ee123f5 100644
--- a/sys/v4l/v4lsrc_calls.c
+++ b/sys/v4l/v4lsrc_calls.c
@@ -611,7 +611,6 @@ gst_v4lsrc_get_fps_list (GstV4lSrc * v4lsrc)
     gst_v4l_set_window_properties (v4lelement);
     return list;
   }
-  return NULL;
 }
 
 #define GST_TYPE_V4LSRC_BUFFER (gst_v4lsrc_buffer_get_type())