diff options
| author | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2012-01-20 13:53:26 +0530 |
|---|---|---|
| committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2015-03-06 22:01:40 +0530 |
| commit | 24c11db36ad4401c8b5e18b3615f66a9d367d759 (patch) | |
| tree | aeee7546c76b15ce8bfcfe9799d835a1b898783d | |
| parent | 245c042eaf25e2d679ba7a3497d154398d721769 (diff) | |
FIXME: Misc Android-specific fixes
| -rw-r--r-- | src/pulse/channelmap.c | 3 | ||||
| -rw-r--r-- | src/pulsecore/mime-type.c | 3 | ||||
| -rw-r--r-- | src/pulsecore/sample-util.c | 3 | ||||
| -rw-r--r-- | src/pulsecore/sndfile-util.c | 6 |
4 files changed, 15 insertions, 0 deletions
diff --git a/src/pulse/channelmap.c b/src/pulse/channelmap.c index c342ef63a..b14e6f2ec 100644 --- a/src/pulse/channelmap.c +++ b/src/pulse/channelmap.c @@ -392,6 +392,9 @@ pa_channel_map* pa_channel_map_init_auto(pa_channel_map *m, unsigned channels, p default: pa_assert_not_reached(); } + + /* The code will never reach here but old versions of gcc moan */ + return 0; } pa_channel_map* pa_channel_map_init_extend(pa_channel_map *m, unsigned channels, pa_channel_map_def_t def) { diff --git a/src/pulsecore/mime-type.c b/src/pulsecore/mime-type.c index b7157b4a9..537301a68 100644 --- a/src/pulsecore/mime-type.c +++ b/src/pulsecore/mime-type.c @@ -167,6 +167,9 @@ char *pa_sample_spec_to_mime_type(const pa_sample_spec *ss, const pa_channel_map default: pa_assert_not_reached(); } + + /* The code will never reach here but old versions of gcc moan */ + return 0; } char *pa_sample_spec_to_mime_type_mimefy(const pa_sample_spec *_ss, const pa_channel_map *_cm) { diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c index 8ae5db96c..fc6fe4a41 100644 --- a/src/pulsecore/sample-util.c +++ b/src/pulsecore/sample-util.c @@ -90,6 +90,9 @@ static uint8_t silence_byte(pa_sample_format_t format) { default: pa_assert_not_reached(); } + + /* The code will never reach here but old versions of gcc moan */ + return 0; } void* pa_silence_memory(void *p, size_t length, const pa_sample_spec *spec) { diff --git a/src/pulsecore/sndfile-util.c b/src/pulsecore/sndfile-util.c index b6cc65ecd..959efac20 100644 --- a/src/pulsecore/sndfile-util.c +++ b/src/pulsecore/sndfile-util.c @@ -388,6 +388,9 @@ pa_sndfile_readf_t pa_sndfile_readf_function(const pa_sample_spec *ss) { default: pa_assert_not_reached(); } + + /* The code will never reach here but old versions of gcc moan */ + return 0; } pa_sndfile_writef_t pa_sndfile_writef_function(const pa_sample_spec *ss) { @@ -412,6 +415,9 @@ pa_sndfile_writef_t pa_sndfile_writef_function(const pa_sample_spec *ss) { default: pa_assert_not_reached(); } + + /* The code will never reach here but old versions of gcc moan */ + return 0; } int pa_sndfile_format_from_string(const char *name) { |