native_midi: fixed warnings

- Non-C90 comments - Unused arguments - "Reserved identifier" warning on the `_NATIVE_MIDI_H_` macro name
libsdl-org · Nov 26, 2019 · b3d8a35 · b3d8a35
1 parent 5f7c973
commit b3d8a35
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/codecs/native_midi/native_midi.h b/src/codecs/native_midi/native_midi.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _NATIVE_MIDI_H_
-#define _NATIVE_MIDI_H_
+#ifndef NATIVE_MIDI_H_
+#define NATIVE_MIDI_H_
 
 #include "SDL_rwops.h"
 
@@ -37,4 +37,4 @@ int native_midi_active(void);
 void native_midi_setvolume(int volume);
 const char *native_midi_error(void);
 
-#endif /* _NATIVE_MIDI_H_ */
+#endif /* NATIVE_MIDI_H_ */
diff --git a/src/codecs/native_midi/native_midi_macosx.c b/src/codecs/native_midi/native_midi_macosx.c
@@ -251,7 +251,7 @@ void native_midi_freesong(NativeMidiSong *song)
             currentsong = NULL;
         MusicPlayerStop(song->player);
 
-        // needed to prevent error and memory leak when disposing sequence
+        /* needed to prevent error and memory leak when disposing sequence */
         MusicPlayerSetSequence(song->player, NULL);
 
         DisposeMusicSequence(song->sequence);

diff --git a/src/codecs/native_midi/native_midi_win32.c b/src/codecs/native_midi/native_midi_win32.c
@@ -57,7 +57,7 @@ static int BlockOut(NativeMidiSong *song)
 
   if ((song->MusicLoaded) && (song->NewEvents))
   {
-    // proff 12/8/98: Added for safety
+    /* proff 12/8/98: Added for safety*/
     song->CurrentHdr = !song->CurrentHdr;
     hdr = &song->MidiStreamHdr[song->CurrentHdr];
     midiOutUnprepareHeader((HMIDIOUT)hMidiStream,hdr,sizeof(MIDIHDR));
@@ -166,6 +166,10 @@ static void MIDItoStream(NativeMidiSong *song, MIDIEvent *evntlist)
 void CALLBACK MidiProc( HMIDIIN hMidi, UINT uMsg, DWORD_PTR dwInstance,
                         DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
 {
+    (void)hMidi;
+    (void)dwInstance;
+    (void)dwParam2;
+
     switch( uMsg )
     {
     case MOM_DONE:
@@ -256,10 +260,10 @@ void native_midi_start(NativeMidiSong *song, int loops)
     merr=midiStreamOpen(&hMidiStream,&MidiDevice,(DWORD)1,(DWORD_PTR)MidiProc,(DWORD_PTR)0,CALLBACK_FUNCTION);
     if (merr!=MMSYSERR_NOERROR)
     {
-      hMidiStream = NULL; // should I do midiStreamClose(hMidiStream) before?
+      hMidiStream = NULL; /* should I do midiStreamClose(hMidiStream) before? */
       return;
     }
-    //midiStreamStop(hMidiStream);
+    /* midiStreamStop(hMidiStream); */
     currentsong=song;
     currentsong->NewPos=0;
     currentsong->MusicPlaying=1;