Fixed Xcode warnings

libsdl-org · May 4, 2013 · c018636 · c018636
1 parent ce3919e
commit c018636
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/dynamic_ogg.h b/dynamic_ogg.h
@@ -31,7 +31,7 @@ typedef struct {
 	void *handle;
 	int (*ov_clear)(OggVorbis_File *vf);
 	vorbis_info *(*ov_info)(OggVorbis_File *vf,int link);
-	int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, char *initial, long ibytes, ov_callbacks callbacks);
+	int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks);
 	ogg_int64_t (*ov_pcm_total)(OggVorbis_File *vf,int i);
 #ifdef OGG_USE_TREMOR
 	long (*ov_read)(OggVorbis_File *vf,char *buffer,int length, int *bitstream);

diff --git a/load_flac.c b/load_flac.c
@@ -61,10 +61,7 @@ static FLAC__StreamDecoderReadStatus flac_read_load_cb(
 		*bytes = SDL_RWread (data->sdl_src, buffer, sizeof (FLAC__byte),
 								*bytes);
 
-		if(*bytes < 0) { // error in read
-			return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
-		}
-		else if(*bytes == 0) { // no data was read (EOF)
+		if (*bytes == 0) { // error or no data was read (EOF)
 			return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
 		}
 		else { // data was read, continue

diff --git a/music.c b/music.c
@@ -530,7 +530,7 @@ Mix_Music *Mix_LoadMUS(const char *file)
 		music->data.cmd = MusicCMD_LoadSong(music_cmd, file);
 		if ( music->data.cmd == NULL ) {
 			SDL_free(music);
-			music == NULL;
+			music = NULL;
 		}
 		return music;
 	}

diff --git a/music_flac.c b/music_flac.c
@@ -62,10 +62,7 @@ static FLAC__StreamDecoderReadStatus flac_read_music_cb(
 	if (*bytes > 0) {
 		*bytes = SDL_RWread (data->rwops, buffer, sizeof (FLAC__byte), *bytes);
 
-		if (*bytes < 0) { // error in read
-			return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
-		}
-		else if (*bytes == 0 ) { // no data was read (EOF)
+		if (*bytes == 0 ) { // error or no data was read (EOF)
 			return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
 		}
 		else { // data was read, continue