Another set of warnings fixes

- Unnecessary comma at last element of list - Unused arguments - Casting between types
libsdl-org · Nov 26, 2019 · f784177 · f784177
1 parent 3571243
commit f784177
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 19 deletions.
diff --git a/src/codecs/music_cmd.c b/src/codecs/music_cmd.c
@@ -284,7 +284,7 @@ Mix_MusicInterface Mix_MusicInterface_CMD =
     MusicCMD_Stop,
     MusicCMD_Delete,
     NULL,   /* Close */
-    NULL,   /* Unload */
+    NULL    /* Unload */
 };
 
 #endif /* MUSIC_CMD */

diff --git a/src/codecs/music_flac.c b/src/codecs/music_flac.c
@@ -400,7 +400,7 @@ static void flac_metadata_music_cb(
         music->sample_rate = metadata->data.stream_info.sample_rate;
         music->channels = metadata->data.stream_info.channels;
         music->bits_per_sample = metadata->data.stream_info.bits_per_sample;
-    /*printf("FLAC: Sample rate = %d, channels = %d, bits_per_sample = %d\n", music->sample_rate, music->channels, music->bits_per_sample);*/
+      /*printf("FLAC: Sample rate = %d, channels = %d, bits_per_sample = %d\n", music->sample_rate, music->channels, music->bits_per_sample);*/
 
         /* SDL's channel mapping and FLAC channel mapping are the same,
            except for 3 channels: SDL is FL FR LFE and FLAC is FL FR FC
@@ -703,7 +703,7 @@ Mix_MusicInterface Mix_MusicInterface_FLAC =
     NULL,   /* Stop */
     FLAC_Delete,
     NULL,   /* Close */
-    FLAC_Unload,
+    FLAC_Unload
 };
 
 #endif /* MUSIC_FLAC */

diff --git a/src/codecs/music_fluidsynth.c b/src/codecs/music_fluidsynth.c
@@ -128,6 +128,7 @@ static int SDLCALL fluidsynth_check_soundfont(const char *path, void *data)
 {
     FILE *file = fopen(path, "r");
 
+    (void)data;
     if (file) {
         fclose(file);
         return 1;
@@ -146,6 +147,7 @@ static int SDLCALL fluidsynth_load_soundfont(const char *path, void *data)
 
 static int FLUIDSYNTH_Open(const SDL_AudioSpec *spec)
 {
+    (void)spec;
     if (!Mix_EachSoundFont(fluidsynth_check_soundfont, NULL)) {
         return -1;
     }
@@ -159,10 +161,10 @@ static FLUIDSYNTH_Music *FLUIDSYNTH_LoadMusic(void *data)
     fluid_settings_t *settings;
 
     if ((music = SDL_calloc(1, sizeof(FLUIDSYNTH_Music)))) {
-        int channels = 2;
+        Uint8 channels = 2;
         if ((music->stream = SDL_NewAudioStream(AUDIO_S16SYS, channels, music_spec.freq, music_spec.format, music_spec.channels, music_spec.freq))) {
             music->buffer_size = music_spec.samples * sizeof(Sint16) * channels;
-            if ((music->buffer = SDL_malloc(music->buffer_size))) {
+            if ((music->buffer = SDL_malloc((size_t)music->buffer_size))) {
                 if ((settings = fluidsynth.new_fluid_settings())) {
                     fluidsynth.fluid_settings_setnum(settings, "synth.sample-rate", (double) music_spec.freq);
 
@@ -245,6 +247,8 @@ static int FLUIDSYNTH_GetSome(void *context, void *data, int bytes, SDL_bool *do
     FLUIDSYNTH_Music *music = (FLUIDSYNTH_Music *)context;
     int filled;
 
+    (void)done;
+
     filled = SDL_AudioStreamGet(music->stream, data, bytes);
     if (filled != 0) {
         return filled;
@@ -301,7 +305,7 @@ Mix_MusicInterface Mix_MusicInterface_FLUIDSYNTH =
     FLUIDSYNTH_Stop,
     FLUIDSYNTH_Delete,
     NULL,   /* Close */
-    FLUIDSYNTH_Unload,
+    FLUIDSYNTH_Unload
 };
 
 #endif /* MUSIC_MID_FLUIDSYNTH */

diff --git a/src/codecs/music_mad.c b/src/codecs/music_mad.c
@@ -668,7 +668,7 @@ Mix_MusicInterface Mix_MusicInterface_MAD =
     NULL,   /* Stop */
     MAD_Delete,
     NULL,   /* Close */
-    NULL,   /* Unload */
+    NULL    /* Unload */
 };
 
 #endif /* MUSIC_MP3_MAD */

diff --git a/src/codecs/music_mikmod.c b/src/codecs/music_mikmod.c
@@ -486,7 +486,7 @@ Mix_MusicInterface Mix_MusicInterface_MIKMOD =
     MIKMOD_Stop,
     MIKMOD_Delete,
     MIKMOD_Close,
-    MIKMOD_Unload,
+    MIKMOD_Unload
 };
 
 #endif /* MUSIC_MOD_MIKMOD */

diff --git a/src/codecs/music_modplug.c b/src/codecs/music_modplug.c
@@ -41,7 +41,7 @@ typedef struct {
     void (*ModPlug_Seek)(ModPlugFile* file, int millisecond);
     void (*ModPlug_GetSettings)(ModPlug_Settings* settings);
     void (*ModPlug_SetSettings)(const ModPlug_Settings* settings);
-    void (*ModPlug_SetMasterVolume)(ModPlugFile* file,unsigned int cvol) ;
+    void (*ModPlug_SetMasterVolume)(ModPlugFile* file,unsigned int cvol);
 } modplug_loader;
 
 static modplug_loader modplug = {
@@ -302,7 +302,7 @@ Mix_MusicInterface Mix_MusicInterface_MODPLUG =
     NULL,   /* Stop */
     MODPLUG_Delete,
     NULL,   /* Close */
-    MODPLUG_Unload,
+    MODPLUG_Unload
 };
 
 #endif /* MUSIC_MOD_MODPLUG */

diff --git a/src/codecs/music_nativemidi.c b/src/codecs/music_nativemidi.c
@@ -105,7 +105,7 @@ Mix_MusicInterface Mix_MusicInterface_NATIVEMIDI =
     NATIVEMIDI_Stop,
     NATIVEMIDI_Delete,
     NULL,   /* Close */
-    NULL,   /* Unload */
+    NULL    /* Unload */
 };
 
 #endif /* MUSIC_MID_NATIVE */

diff --git a/src/codecs/music_ogg.c b/src/codecs/music_ogg.c
@@ -498,7 +498,7 @@ Mix_MusicInterface Mix_MusicInterface_OGG =
     NULL,   /* Stop */
     OGG_Delete,
     NULL,   /* Close */
-    OGG_Unload,
+    OGG_Unload
 };
 
 #endif /* MUSIC_OGG */

diff --git a/src/codecs/music_opus.c b/src/codecs/music_opus.c
@@ -182,14 +182,14 @@ static int OPUS_UpdateSection(OPUS_music *music)
         music->stream = NULL;
     }
 
-    music->stream = SDL_NewAudioStream(AUDIO_S16, op_info->channel_count, 48000,
+    music->stream = SDL_NewAudioStream(AUDIO_S16, (Uint8)op_info->channel_count, 48000,
                                        music_spec.format, music_spec.channels, music_spec.freq);
     if (!music->stream) {
         return -1;
     }
 
-    music->buffer_size = music_spec.samples * sizeof(opus_int16) * op_info->channel_count;
-    music->buffer = (char *)SDL_malloc(music->buffer_size);
+    music->buffer_size = (int)music_spec.samples * (int)sizeof(opus_int16) * op_info->channel_count;
+    music->buffer = (char *)SDL_malloc((size_t)music->buffer_size);
     if (!music->buffer) {
         return -1;
     }
@@ -273,7 +273,7 @@ static int OPUS_GetSome(void *context, void *data, int bytes, SDL_bool *done)
     }
 
     section = music->section;
-    samples = opus.op_read(music->of, (opus_int16 *)music->buffer, music->buffer_size / sizeof(opus_int16), &section);
+    samples = opus.op_read(music->of, (opus_int16 *)music->buffer, music->buffer_size / (int)sizeof(opus_int16), &section);
     if (samples < 0) {
         set_op_error("op_read", samples);
         return -1;
@@ -365,7 +365,7 @@ Mix_MusicInterface Mix_MusicInterface_Opus =
     NULL,   /* Stop */
     OPUS_Delete,
     NULL,   /* Close */
-    OPUS_Unload,
+    OPUS_Unload
 };
 
 #endif /* MUSIC_OPUS */

diff --git a/src/codecs/music_timidity.c b/src/codecs/music_timidity.c
@@ -213,7 +213,7 @@ Mix_MusicInterface Mix_MusicInterface_TIMIDITY =
     NULL,   /* Stop */
     TIMIDITY_Delete,
     TIMIDITY_Close,
-    NULL,   /* Unload */
+    NULL    /* Unload */
 };
 
 #endif /* MUSIC_MID_TIMIDITY */

diff --git a/src/codecs/music_wav.c b/src/codecs/music_wav.c
@@ -632,7 +632,7 @@ Mix_MusicInterface Mix_MusicInterface_WAV =
     NULL,   /* Stop */
     WAV_Delete,
     NULL,   /* Close */
-    NULL,   /* Unload */
+    NULL    /* Unload */
 };
 
 #endif /* MUSIC_WAV */