summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/input/input_cda.c4
-rw-r--r--src/input/input_dvd.c4
-rw-r--r--src/input/input_file.c4
-rw-r--r--src/input/input_http.c2
-rw-r--r--src/input/input_mms.c2
-rw-r--r--src/input/input_net.c2
-rw-r--r--src/input/input_rtp.c5
-rw-r--r--src/input/input_stdin_fifo.c4
-rw-r--r--src/input/input_vcd.c4
9 files changed, 15 insertions, 16 deletions
diff --git a/src/input/input_cda.c b/src/input/input_cda.c
index f5f7e672d..62759f9e8 100644
--- a/src/input/input_cda.c
+++ b/src/input/input_cda.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_cda.c,v 1.21 2002/04/23 15:45:20 esnel Exp $
+ * $Id: input_cda.c,v 1.22 2002/04/24 08:12:13 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1768,7 +1768,7 @@ static int cda_plugin_get_optional_data (input_plugin_t *this_gen, void *data, i
return INPUT_OPTIONAL_UNSUPPORTED;
}
-static int cda_plugin_dispose (input_plugin_t *this_gen ) {
+static void cda_plugin_dispose (input_plugin_t *this_gen ) {
cda_input_plugin_t *this = (cda_input_plugin_t *) this_gen;
int i;
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index db3a1ccb6..97d2889db 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_dvd.c,v 1.46 2002/04/23 15:45:20 esnel Exp $
+ * $Id: input_dvd.c,v 1.47 2002/04/24 08:12:13 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -786,7 +786,7 @@ static int dvd_plugin_get_optional_data (input_plugin_t *this_gen,
return INPUT_OPTIONAL_UNSUPPORTED;
}
-static int dvd_plugin_dispose (input_plugin_t *this_gen ) {
+static void dvd_plugin_dispose (input_plugin_t *this_gen ) {
dvd_input_plugin_t *this = (dvd_input_plugin_t *) this_gen;
int i;
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 3ccffcc4f..5ebe7dda5 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_file.c,v 1.46 2002/04/23 15:45:21 esnel Exp $
+ * $Id: input_file.c,v 1.47 2002/04/24 08:12:13 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -836,7 +836,7 @@ static int file_plugin_get_optional_data (input_plugin_t *this_gen,
return INPUT_OPTIONAL_UNSUPPORTED;
}
-static int file_plugin_dispose (input_plugin_t *this_gen ) {
+static void file_plugin_dispose (input_plugin_t *this_gen ) {
file_input_plugin_t *this = (file_input_plugin_t *) this_gen;
if (this->mrl)
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 96a41290d..871313c48 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -659,7 +659,7 @@ static int http_plugin_get_optional_data (input_plugin_t *this_gen,
return INPUT_OPTIONAL_UNSUPPORTED;
}
-static int http_plugin_dispose (input_plugin_t *this_gen ) {
+static void http_plugin_dispose (input_plugin_t *this_gen ) {
free (this_gen);
}
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index c06465b6a..16caaaae9 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -308,7 +308,7 @@ static int mms_plugin_get_optional_data (input_plugin_t *this_gen,
return INPUT_OPTIONAL_UNSUPPORTED;
}
-static int mms_plugin_dispose (input_plugin_t *this_gen ) {
+static void mms_plugin_dispose (input_plugin_t *this_gen ) {
free (this_gen);
}
diff --git a/src/input/input_net.c b/src/input/input_net.c
index aef84a1da..6fa8a04f0 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -325,7 +325,7 @@ static int net_plugin_get_optional_data (input_plugin_t *this_gen,
return INPUT_OPTIONAL_UNSUPPORTED;
}
-static int net_plugin_dispose (input_plugin_t *this_gen ) {
+static void net_plugin_dispose (input_plugin_t *this_gen ) {
free (this_gen);
}
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index 0501ba3bb..114d35e61 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -476,15 +476,14 @@ static int rtp_plugin_get_optional_data (input_plugin_t *this_gen,
return INPUT_OPTIONAL_UNSUPPORTED;
}
-static int rtp_plugin_dispose (input_plugin_t *this_gen ) {
+static void rtp_plugin_dispose (input_plugin_t *this_gen ) {
rtp_input_plugin_t *this = (rtp_input_plugin_t *) this_gen;
input_buffer_t *buf;
if (this->fifo_tail.next) {
while (this->fifo_tail.next != &this->fifo_tail) {
- buf = this->fifo_tail.next->buf;
+ buf = this->fifo_tail.next;
this->fifo_tail.next = this->fifo_tail.next->next;
-
free (buf->buf);
free (buf);
}
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 3aad8ab62..ce2e9acdb 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_stdin_fifo.c,v 1.24 2002/04/23 15:45:21 esnel Exp $
+ * $Id: input_stdin_fifo.c,v 1.25 2002/04/24 08:12:13 f1rmb Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -341,7 +341,7 @@ static int stdin_plugin_get_optional_data (input_plugin_t *this_gen,
return INPUT_OPTIONAL_UNSUPPORTED;
}
-static int stdin_plugin_dispose (input_plugin_t *this_gen ) {
+static void stdin_plugin_dispose (input_plugin_t *this_gen ) {
free (this_gen);
}
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 197616041..89dc04035 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: input_vcd.c,v 1.40 2002/04/23 15:45:21 esnel Exp $
+ * $Id: input_vcd.c,v 1.41 2002/04/24 08:12:13 f1rmb Exp $
*
*/
@@ -1121,7 +1121,7 @@ static int vcd_plugin_get_optional_data (input_plugin_t *this_gen,
return INPUT_OPTIONAL_UNSUPPORTED;
}
-static int vcd_plugin_dispose (input_plugin_t *this_gen ) {
+static void vcd_plugin_dispose (input_plugin_t *this_gen ) {
vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen;
int i;