Fixed bug #809

O.Sezer 2009-09-26 04:38:45 PDT the filename argument of native_midi_loadsong() should be const char*, the attached patch does that and also removes the unnecessary char* cast in music.c where native_midi_loadsong() is called.
libsdl-org · Sep 26, 2009 · a93f52f · a93f52f
1 parent 079e34d
commit a93f52f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/music.c b/music.c
@@ -627,7 +627,7 @@ Mix_Music *Mix_LoadMUS(const char *file)
 		music->type = MUS_MID;
 #ifdef USE_NATIVE_MIDI
   		if ( native_midi_ok ) {
-  			music->data.nativemidi = native_midi_loadsong((char *)file);
+  			music->data.nativemidi = native_midi_loadsong(file);
 	  		if ( music->data.nativemidi == NULL ) {
 		  		Mix_SetError("%s", native_midi_error());
 			  	music->error = 1;

diff --git a/native_midi/native_midi.h b/native_midi/native_midi.h
@@ -28,7 +28,7 @@
 typedef struct _NativeMidiSong NativeMidiSong;
 
 int native_midi_detect();
-NativeMidiSong *native_midi_loadsong(char *midifile);
+NativeMidiSong *native_midi_loadsong(const char *midifile);
 NativeMidiSong *native_midi_loadsong_RW(SDL_RWops *rw);
 void native_midi_freesong(NativeMidiSong *song);
 void native_midi_start(NativeMidiSong *song);

diff --git a/native_midi/native_midi_mac.c b/native_midi/native_midi_mac.c
@@ -89,7 +89,7 @@ int native_midi_detect()
 	return 1;
 }
 
-NativeMidiSong *native_midi_loadsong(char *midifile)
+NativeMidiSong *native_midi_loadsong(const char *midifile)
 {
 	NativeMidiSong	*song = NULL;
 	MIDIEvent		*evntlist = NULL;

diff --git a/native_midi/native_midi_win32.c b/native_midi/native_midi_win32.c
@@ -188,7 +188,7 @@ int native_midi_detect()
   return 1;
 }
 
-NativeMidiSong *native_midi_loadsong(char *midifile)
+NativeMidiSong *native_midi_loadsong(const char *midifile)
 {
 	NativeMidiSong *newsong;
 	MIDIEvent		*evntlist = NULL;

diff --git a/native_midi_gpl/native_midi_gpl.c b/native_midi_gpl/native_midi_gpl.c
@@ -127,7 +127,7 @@ int native_midi_detect()
     return ret;
 }
 
-NativeMidiSong *native_midi_loadsong(char *midifile)
+NativeMidiSong *native_midi_loadsong(const char *midifile)
 {
     NativeMidiSong	*song = NULL;
     char 		*extra;