oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

audio-parser, output_thread: work around -Wmaybe-uninitialized

Browse Source 
False positives in gcc 4.7.
This commit is contained in:
Max Kellermann 2012-06-12 19:21:53 +02:00
parent 50cfb997cc
commit 055257a210
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/audio_parser.c
View File

@ -26,6 +26,7 @@
#include "audio_parser.h" #include "audio_parser.h"
#include "audio_format.h" #include "audio_format.h"
#include "audio_check.h" #include "audio_check.h"
#include "gcc.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@ -160,6 +161,11 @@ audio_format_parse(struct audio_format *dest, const char *src,
/* parse sample rate */ /* parse sample rate */
#if GCC_CHECK_VERSION(4,7)
/* workaround -Wmaybe-uninitialized false positive */
rate = 0;
#endif
if (!parse_sample_rate(src, mask, &rate, &src, error_r)) if (!parse_sample_rate(src, mask, &rate, &src, error_r))
return false; return false;
@ -171,6 +177,11 @@ audio_format_parse(struct audio_format *dest, const char *src,
/* parse sample format */ /* parse sample format */
#if GCC_CHECK_VERSION(4,7)
/* workaround -Wmaybe-uninitialized false positive */
sample_format = SAMPLE_FORMAT_UNDEFINED;
#endif
if (!parse_sample_format(src, mask, &sample_format, &src, error_r)) if (!parse_sample_format(src, mask, &sample_format, &src, error_r))
return false; return false;

5
src/output_thread.c
View File

@ -29,6 +29,7 @@
#include "filter/convert_filter_plugin.h" #include "filter/convert_filter_plugin.h"
#include "filter/replay_gain_filter_plugin.h" #include "filter/replay_gain_filter_plugin.h"
#include "mpd_error.h" #include "mpd_error.h"
#include "gcc.h"
#include <glib.h> #include <glib.h>
@ -438,6 +439,10 @@ ao_play_chunk(struct audio_output *ao, const struct music_chunk *chunk)
} }
size_t size; size_t size;
#if GCC_CHECK_VERSION(4,7)
/* workaround -Wmaybe-uninitialized false positive */
size = 0;
#endif
const char *data = ao_filter_chunk(ao, chunk, &size); const char *data = ao_filter_chunk(ao, chunk, &size);
if (data == NULL) { if (data == NULL) {
ao_close(ao, false); ao_close(ao, false);