try to fix various warnings from gcc when optimization flags are enabled

5 files changed, 18 insertions, 7 deletions

diff --git a/libs/evoral/src/libsmf/smf.c b/libs/evoral/src/libsmf/smf.c
index b79d7543b6..c062f99659 100644
--- a/libs/evoral/src/libsmf/smf.c
+++ b/libs/evoral/src/libsmf/smf.c
@@ -151,7 +151,9 @@ smf_track_delete(smf_track_t *track)
 void
 smf_add_track(smf_t *smf, smf_track_t *track)
 {
+#ifndef NDEBUG
 	int cantfail;
+#endif
 
 	assert(track->smf == NULL);
 
@@ -162,8 +164,13 @@ smf_add_track(smf_t *smf, smf_track_t *track)
 	track->track_number = smf->number_of_tracks;
 
 	if (smf->number_of_tracks > 1) {
+#ifndef NDEBUG
 		cantfail = smf_set_format(smf, 1);
 		assert(!cantfail);
+#else
+		smf_set_format(smf, 1);
+#endif
+		
 	}
 }
 
@@ -860,9 +867,8 @@ smf_get_next_event(smf_t *smf)
 void
 smf_skip_next_event(smf_t *smf)
 {
-	void *notused;
-
-	notused = smf_get_next_event(smf);
+	smf_event_t *ignored = smf_get_next_event(smf);
+	(void) ignored;
 }
 
 /**
diff --git a/libs/evoral/src/libsmf/smf_decode.c b/libs/evoral/src/libsmf/smf_decode.c
index 0951a6e2f8..bfba08e9f9 100644
--- a/libs/evoral/src/libsmf/smf_decode.c
+++ b/libs/evoral/src/libsmf/smf_decode.c
@@ -490,7 +490,7 @@ static void
 note_from_int(char *buf, int note_number)
 {
 	int note, octave;
-	char *names[] = {"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"};
+	const char *names[] = {"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"};
 
 	octave = note_number / 12 - 1;
 	note = note_number % 12;
diff --git a/libs/evoral/src/libsmf/smf_private.h b/libs/evoral/src/libsmf/smf_private.h
index 537a29b889..f415eac9da 100644
--- a/libs/evoral/src/libsmf/smf_private.h
+++ b/libs/evoral/src/libsmf/smf_private.h
@@ -75,6 +75,7 @@ void remove_last_tempo_with_pulses(smf_t *smf, size_t pulses);
 int smf_event_is_tempo_change_or_time_signature(const smf_event_t *event) WARN_UNUSED_RESULT;
 int smf_event_length_is_valid(const smf_event_t *event) WARN_UNUSED_RESULT;
 int is_status_byte(const unsigned char status) WARN_UNUSED_RESULT;
+smf_track_t* smf_find_track_with_next_event (smf_t *smf);
 
 #endif /* SMF_PRIVATE_H */
 
diff --git a/libs/evoral/src/libsmf/smf_save.c b/libs/evoral/src/libsmf/smf_save.c
index b99af75461..1941ed4f7b 100644
--- a/libs/evoral/src/libsmf/smf_save.c
+++ b/libs/evoral/src/libsmf/smf_save.c
@@ -215,7 +215,11 @@ smf_event_new_textual(int type, const char *text)
 	vlq_length = smf_format_vlq(event->midi_buffer + 2, MAX_VLQ_LENGTH - 2, text_length);
 	copied_length = snprintf((char *)event->midi_buffer + vlq_length + 2, event->midi_buffer_length - vlq_length - 2, "%s", text);
 
+#ifndef NDEBUG
+	(void) copied_length; /* stop gcc warning about unusued vars for non-debug build */
+#else
 	assert(copied_length == text_length);
+#endif
 
 	event->midi_buffer_length = 2 + vlq_length + text_length;
 
diff --git a/libs/evoral/src/libsmf/smf_tempo.c b/libs/evoral/src/libsmf/smf_tempo.c
index c24e7460c1..1d89639218 100644
--- a/libs/evoral/src/libsmf/smf_tempo.c
+++ b/libs/evoral/src/libsmf/smf_tempo.c
@@ -133,13 +133,13 @@ maybe_add_to_tempo_map(smf_event_t *event)
 
 	/* Tempo Change? */
 	if (event->midi_buffer[1] == 0x51) {
-		int new_tempo = (event->midi_buffer[3] << 16) + (event->midi_buffer[4] << 8) + event->midi_buffer[5];
-		if (new_tempo <= 0) {
+		int ntempo = (event->midi_buffer[3] << 16) + (event->midi_buffer[4] << 8) + event->midi_buffer[5];
+		if (ntempo <= 0) {
 			g_critical("Ignoring invalid tempo change.");
 			return;
 		}
 
-		add_tempo(event->track->smf, event->time_pulses, new_tempo);
+		add_tempo(event->track->smf, event->time_pulses, ntempo);
 	}
 
 	/* Time Signature? */