Merge from --mdev.

Erik de Castro Lopo committed 17 years ago

Commit c6bc4682 parents cd83675 94966fc10 files · +30 −26Browse files

Unified · Split

10 files

@@ -1,3 +1,13 @@
		1	2008-12-12 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
		2
		3	* src/samplerate.c examples/audio_out.c tests/*.c
		4	Fix a couple of very minor warnings uncovered by Erik Hovland using a
		5	static analysis tool.
		6
		7	* src/src_*.c
		8	Fix a potential memory leak. Thanks to Peter G. Vavaroutsos for point this
		9	out.
		10
1	2008-12-11 Erik de Castro Lopo <erikd AT mega-nerd DOT com>	11	2008-12-11 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
2		12
3	* reconfigure.mk autogen.sh	13	* reconfigure.mk autogen.sh

 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
 #include <config.h>
 AUDIO_OUT *
 audio_open (int channels, int samplerate)
 {
-	channels = samplerate ;
+	(void) channels ;
+	(void) samplerate ;
 	return NULL ;
 } /* audio_open */
 void
 audio_play (get_audio_callback_t callback, AUDIO_OUT *audio_out, void *callback_data)
 {
-	callback = NULL ;
+	(void) callback ;
-	audio_out = NULL ;
+	(void) audio_out ;
-	callback_data = NULL ;
+	(void) callback_data ;
 	return ;
 } /* audio_play */

@@ -87,7 +87,8 @@ src_callback_new (src_callback_t func, int converter_type, int channels, int *er · 86 unmodified lines
87	if (error != NULL)	87	if (error != NULL)
88	*error = 0 ;	88	*error = 0 ;
89		89
90	src_state = src_new (converter_type, channels, error) ;	90	if ((src_state = src_new (converter_type, channels, error)) == NULL)
		91	return NULL ;
91		92
92	src_reset (src_state) ;	93	src_reset (src_state) ;
93		94

 		return SRC_ERR_BAD_CONVERTER ;
 	if (psrc->private_data != NULL)
-	{	priv = (LINEAR_DATA*) psrc->private_data ;
+	{	free (psrc->private_data) ;
-		if (priv->linear_magic_marker != LINEAR_MAGIC_MARKER)
+		psrc->private_data = NULL ;
-		{	free (psrc->private_data) ;
-			psrc->private_data = NULL ;
-			} ;
 		} ;
 	if (psrc->private_data == NULL)

 		return SRC_ERR_SHIFT_BITS ;
 	if (psrc->private_data != NULL)
-	{	filter = (SINC_FILTER*) psrc->private_data ;
+	{	free (psrc->private_data) ;
-		if (filter->sinc_magic_marker != SINC_MAGIC_MARKER)
+		psrc->private_data = NULL ;
-		{	free (psrc->private_data) ;
-			psrc->private_data = NULL ;
-			} ;
 		} ;
 	memset (&temp_filter, 0, sizeof (temp_filter)) ;

 		return SRC_ERR_BAD_CONVERTER ;
 	if (psrc->private_data != NULL)
-	{	priv = (ZOH_DATA*) psrc->private_data ;
+	{	free (psrc->private_data) ;
-		if (priv->zoh_magic_marker != ZOH_MAGIC_MARKER)
+		psrc->private_data = NULL ;
-		{	free (psrc->private_data) ;
-			psrc->private_data = NULL ;
-			} ;
 		} ;
 	if (psrc->private_data == NULL)

@@ -107,7 +107,7 @@ callback_hang_test (int converter) · 106 unmodified lines
107	static void	107	static void
108	alarm_handler (int number)	108	alarm_handler (int number)
109	{	109	{
110	number = 0 ;	110	(void) number ;
111	printf ("\n\n Error : Hang inside src_callback_read() detected. Exiting!\n\n") ;	111	printf ("\n\n Error : Hang inside src_callback_read() detected. Exiting!\n\n") ;
112	exit (1) ;	112	exit (1) ;
113	} /* alarm_handler */	113	} /* alarm_handler */
@@ -117,7 +117,7 @@ input_callback (void cb_data, float *data) · 3 unmodified lines
117	{	117	{
118	static float buffer [20] ;	118	static float buffer [20] ;
119		119
120	cb_data = NULL ;	120	(void) cb_data ;
121	*data = buffer ;	121	*data = buffer ;
122		122
123	return ARRAY_LEN (buffer) ;	123	return ARRAY_LEN (buffer) ;

 */
 #include <stdio.h>
+#include <stdlib.h>
 #include <samplerate.h>
 #include "util.h"
 	data.data_in = in ;
 	data.data_out = out ;
-	src_simple (&data, converter, 1) ;
+	if (src_simple (&data, converter, 1))
+	{	puts ("src_simple failed.") ;
+		exit (1) ;
+		} ;
 	puts ("ok") ;
 } /* downsample_test */

Keyboard shortcuts