From 8851679d5022ab8aa77a4596c895dd91948b23f6 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Wed, 18 Dec 2019 15:51:40 +0300 Subject: [PATCH] load_voc.c, music_flac.c: fix implicit-fallthrough warnings. --- src/codecs/load_voc.c | 14 +++++++------- src/codecs/music_flac.c | 5 ++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/codecs/load_voc.c b/src/codecs/load_voc.c index ba00e233..41a85b90 100644 --- a/src/codecs/load_voc.c +++ b/src/codecs/load_voc.c @@ -301,7 +301,7 @@ static int voc_get_block(SDL_RWops *src, vs_t *v, SDL_AudioSpec *spec) if (SDL_RWread(src, trash, sizeof (Uint8), 2) != 2) return 0; - /* Falling! Falling! */ + /* fallthrough */ default: /* text block or other krapola. */ for(i = 0; i < sblen; i++) @@ -351,12 +351,12 @@ static Uint32 voc_read(SDL_RWops *src, vs_t *v, Uint8 *buf, SDL_AudioSpec *spec) if (v->size == ST_SIZE_WORD) { #if (SDL_BYTEORDER == SDL_BIG_ENDIAN) - Uint16 *samples = (Uint16 *)buf; - for (; v->rest > 0; v->rest -= 2) - { - *samples = SDL_SwapLE16(*samples); - samples++; - } + Uint16 *samples = (Uint16 *)buf; + for (; v->rest > 0; v->rest -= 2) + { + *samples = SDL_SwapLE16(*samples); + samples++; + } #endif done >>= 1; } diff --git a/src/codecs/music_flac.c b/src/codecs/music_flac.c index 4142eaaf..7d1a717f 100644 --- a/src/codecs/music_flac.c +++ b/src/codecs/music_flac.c @@ -555,9 +555,9 @@ static void *FLAC_CreateFromRW(SDL_RWops *src, int freesrc) if (was_error) { switch (init_stage) { case 2: - flac.FLAC__stream_decoder_finish(music->flac_decoder); + flac.FLAC__stream_decoder_finish(music->flac_decoder); /* fallthrough */ case 1: - flac.FLAC__stream_decoder_delete(music->flac_decoder); + flac.FLAC__stream_decoder_delete(music->flac_decoder); /* fallthrough */ case 0: SDL_free(music); break; @@ -568,7 +568,6 @@ static void *FLAC_CreateFromRW(SDL_RWops *src, int freesrc) /* loop_start, loop_end and loop_len get set by metadata callback if tags * are present in metadata. */ - full_length = flac.FLAC__stream_decoder_get_total_samples(music->flac_decoder); if (((music->loop_start >= 0) || (music->loop_end > 0)) && ((music->loop_start < music->loop_end) || (music->loop_end > 0)) &&