From 5b0d74a7d3329ec3fc5818d9185aba7f29291ca7 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Wed, 26 Nov 2008 18:01:18 +0000 Subject: Get rid of unused return values, except the one from decode_chunk() which will be used in the dual core split. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19236 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/demac/libdemac/decoder.c | 10 ++++------ apps/codecs/demac/libdemac/entropy.c | 12 +++++------- apps/codecs/demac/libdemac/entropy.h | 12 ++++++------ apps/codecs/demac/libdemac/filter.c | 6 ++---- apps/codecs/demac/libdemac/filter.h | 15 ++++++++++----- apps/codecs/demac/libdemac/predictor.c | 18 +++++++----------- apps/codecs/demac/libdemac/predictor.h | 6 ++++-- 7 files changed, 38 insertions(+), 41 deletions(-) diff --git a/apps/codecs/demac/libdemac/decoder.c b/apps/codecs/demac/libdemac/decoder.c index 31bcb28b72..30ab2bd359 100644 --- a/apps/codecs/demac/libdemac/decoder.c +++ b/apps/codecs/demac/libdemac/decoder.c @@ -82,7 +82,6 @@ int ICODE_ATTR_DEMAC decode_chunk(struct ape_ctx_t* ape_ctx, int32_t* decoded0, int32_t* decoded1, int count) { - int res; int32_t left, right; #ifdef ROCKBOX int scale = (APE_OUTPUT_DEPTH - ape_ctx->bps); @@ -93,11 +92,11 @@ int ICODE_ATTR_DEMAC decode_chunk(struct ape_ctx_t* ape_ctx, if ((ape_ctx->channels==1) || (ape_ctx->frameflags & APE_FRAMECODE_PSEUDO_STEREO)) { if (ape_ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) { - res = entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed, decoded0, decoded1, count); + entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed, decoded0, decoded1, count); /* We are pure silence, so we're done. */ return 0; } else { - res = entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed, decoded0, NULL, count); + entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed, decoded0, NULL, count); } switch (ape_ctx->compressiontype) @@ -143,7 +142,7 @@ int ICODE_ATTR_DEMAC decode_chunk(struct ape_ctx_t* ape_ctx, return 0; } - res = entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed, decoded0, decoded1, count); + entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed, decoded0, decoded1, count); /* Apply filters - compression type 1000 doesn't have any */ switch (ape_ctx->compressiontype) @@ -184,6 +183,5 @@ int ICODE_ATTR_DEMAC decode_chunk(struct ape_ctx_t* ape_ctx, } } } - - return res; + return 0; } diff --git a/apps/codecs/demac/libdemac/entropy.c b/apps/codecs/demac/libdemac/entropy.c index e8561122a7..54b5cc57b6 100644 --- a/apps/codecs/demac/libdemac/entropy.c +++ b/apps/codecs/demac/libdemac/entropy.c @@ -419,11 +419,11 @@ void init_entropy_decoder(struct ape_ctx_t* ape_ctx, *firstbyte = bytebufferoffset; } -int ICODE_ATTR_DEMAC entropy_decode(struct ape_ctx_t* ape_ctx, - unsigned char* inbuffer, int* firstbyte, - int* bytesconsumed, - int32_t* decoded0, int32_t* decoded1, - int blockstodecode) +void ICODE_ATTR_DEMAC entropy_decode(struct ape_ctx_t* ape_ctx, + unsigned char* inbuffer, int* firstbyte, + int* bytesconsumed, + int32_t* decoded0, int32_t* decoded1, + int blockstodecode) { bytebuffer = inbuffer; bytebufferoffset = *firstbyte; @@ -458,6 +458,4 @@ int ICODE_ATTR_DEMAC entropy_decode(struct ape_ctx_t* ape_ctx, /* Return the new state of the buffer */ *bytesconsumed = bytebuffer - inbuffer; *firstbyte = bytebufferoffset; - - return(0); } diff --git a/apps/codecs/demac/libdemac/entropy.h b/apps/codecs/demac/libdemac/entropy.h index dd6736cb15..fac2a44d99 100644 --- a/apps/codecs/demac/libdemac/entropy.h +++ b/apps/codecs/demac/libdemac/entropy.h @@ -2,7 +2,7 @@ libdemac - A Monkey's Audio decoder -$Id:$ +$Id$ Copyright (C) Dave Chapman 2007 @@ -31,10 +31,10 @@ void init_entropy_decoder(struct ape_ctx_t* ape_ctx, unsigned char* inbuffer, int* firstbyte, int* bytesconsumed); -int entropy_decode(struct ape_ctx_t* ape_ctx, - unsigned char* inbuffer, int* firstbyte, - int* bytesconsumed, - int32_t* decoded0, int32_t* decoded1, - int blockstodecode); +void entropy_decode(struct ape_ctx_t* ape_ctx, + unsigned char* inbuffer, int* firstbyte, + int* bytesconsumed, + int32_t* decoded0, int32_t* decoded1, + int blockstodecode); #endif diff --git a/apps/codecs/demac/libdemac/filter.c b/apps/codecs/demac/libdemac/filter.c index d66bdc69b0..4a3eb74744 100644 --- a/apps/codecs/demac/libdemac/filter.c +++ b/apps/codecs/demac/libdemac/filter.c @@ -237,8 +237,8 @@ void INIT_FILTER(filter_int* buf) do_init_filter(&filter1, buf + ORDER*3 + FILTER_HISTORY_SIZE); } -int ICODE_ATTR_DEMAC APPLY_FILTER(int fileversion, int32_t* data0, - int32_t* data1, int count) +void ICODE_ATTR_DEMAC APPLY_FILTER(int fileversion, int32_t* data0, + int32_t* data1, int count) { if (fileversion >= 3980) { do_apply_filter_3980(&filter0, data0, count); @@ -249,6 +249,4 @@ int ICODE_ATTR_DEMAC APPLY_FILTER(int fileversion, int32_t* data0, if (data1 != NULL) do_apply_filter_3970(&filter1, data1, count); } - - return 0; } diff --git a/apps/codecs/demac/libdemac/filter.h b/apps/codecs/demac/libdemac/filter.h index bbe51d4572..bfd0c552a6 100644 --- a/apps/codecs/demac/libdemac/filter.h +++ b/apps/codecs/demac/libdemac/filter.h @@ -28,18 +28,23 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA #include "demac_config.h" void init_filter_16_11(filter_int* buf); -int apply_filter_16_11(int fileversion, int32_t* decoded0, int32_t* decoded1, int count); +void apply_filter_16_11(int fileversion, int32_t* decoded0, + int32_t* decoded1, int count); void init_filter_64_11(filter_int* buf); -int apply_filter_64_11(int fileversion, int32_t* decoded0, int32_t* decoded1, int count); +void apply_filter_64_11(int fileversion, int32_t* decoded0, + int32_t* decoded1, int count); void init_filter_32_10(filter_int* buf); -int apply_filter_32_10(int fileversion, int32_t* decoded0, int32_t* decoded1, int count); +void apply_filter_32_10(int fileversion, int32_t* decoded0, + int32_t* decoded1, int count); void init_filter_256_13(filter_int* buf); -int apply_filter_256_13(int fileversion, int32_t* decoded0, int32_t* decoded1, int count); +void apply_filter_256_13(int fileversion, int32_t* decoded0, + int32_t* decoded1, int count); void init_filter_1280_15(filter_int* buf); -int apply_filter_1280_15(int fileversion, int32_t* decoded0, int32_t* decoded1, int count); +void apply_filter_1280_15(int fileversion, int32_t* decoded0, + int32_t* decoded1, int count); #endif diff --git a/apps/codecs/demac/libdemac/predictor.c b/apps/codecs/demac/libdemac/predictor.c index 67a17f4b5d..d4f886fb8c 100644 --- a/apps/codecs/demac/libdemac/predictor.c +++ b/apps/codecs/demac/libdemac/predictor.c @@ -68,10 +68,10 @@ void init_predictor_decoder(struct predictor_t* p) } #if !defined(CPU_ARM) && !defined(CPU_COLDFIRE) -int ICODE_ATTR_DEMAC predictor_decode_stereo(struct predictor_t* p, - int32_t* decoded0, - int32_t* decoded1, - int count) +void ICODE_ATTR_DEMAC predictor_decode_stereo(struct predictor_t* p, + int32_t* decoded0, + int32_t* decoded1, + int count) { int32_t predictionA, predictionB; @@ -208,14 +208,12 @@ int ICODE_ATTR_DEMAC predictor_decode_stereo(struct predictor_t* p, p->buf = p->historybuffer; } } - - return 0; } #endif -int ICODE_ATTR_DEMAC predictor_decode_mono(struct predictor_t* p, - int32_t* decoded0, - int count) +void ICODE_ATTR_DEMAC predictor_decode_mono(struct predictor_t* p, + int32_t* decoded0, + int count) { int32_t predictionA, currentA, A; @@ -270,6 +268,4 @@ int ICODE_ATTR_DEMAC predictor_decode_mono(struct predictor_t* p, } p->YlastA = currentA; - - return 0; } diff --git a/apps/codecs/demac/libdemac/predictor.h b/apps/codecs/demac/libdemac/predictor.h index df2ba629e6..6a0a81983b 100644 --- a/apps/codecs/demac/libdemac/predictor.h +++ b/apps/codecs/demac/libdemac/predictor.h @@ -30,7 +30,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA #include "filter.h" void init_predictor_decoder(struct predictor_t* p); -int predictor_decode_stereo(struct predictor_t* p, int32_t* decoded0, int32_t* decoded1, int count); -int predictor_decode_mono(struct predictor_t* p, int32_t* decoded0, int count); +void predictor_decode_stereo(struct predictor_t* p, int32_t* decoded0, + int32_t* decoded1, int count); +void predictor_decode_mono(struct predictor_t* p, int32_t* decoded0, + int count); #endif -- cgit v1.2.3