From 0cca2724311b8df9989dc46efad12bdbe05c3883 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 4 Nov 2013 21:32:41 -0500 Subject: [PATCH] try to fix various warnings from gcc when optimization flags are enabled --- gtk2_ardour/audio_streamview.cc | 2 +- libs/ardour/ardour/cycle_timer.h | 2 ++ libs/ardour/export_channel.cc | 4 ++++ libs/ardour/globals.cc | 4 ++-- libs/ardour/plugin_manager.cc | 4 ++++ libs/audiographer/audiographer/debuggable.h | 8 ++++---- libs/backends/jack/jack_audiobackend.cc | 7 ++++--- libs/evoral/src/libsmf/smf.c | 12 +++++++++--- libs/evoral/src/libsmf/smf_decode.c | 2 +- libs/evoral/src/libsmf/smf_private.h | 1 + libs/evoral/src/libsmf/smf_save.c | 4 ++++ libs/evoral/src/libsmf/smf_tempo.c | 6 +++--- libs/pbd/fpu.cc | 4 ++-- libs/pbd/openuri.cc | 2 +- libs/pbd/semutils.cc | 2 ++ 15 files changed, 44 insertions(+), 20 deletions(-) diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index 088eec17e5..7b84219b75 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -264,7 +264,7 @@ AudioStreamView::setup_rec_box () at = _trackview.audio_track(); /* we know what it is already */ framepos_t const frame_pos = at->current_capture_start (); gdouble xstart = _trackview.editor().sample_to_pixel (frame_pos); - gdouble xend; + gdouble xend = xstart; /* keeps gcc optimized happy, really set in switch() below */ uint32_t fill_color; switch (_trackview.audio_track()->mode()) { diff --git a/libs/ardour/ardour/cycle_timer.h b/libs/ardour/ardour/cycle_timer.h index 35cc2a4c73..839b54150c 100644 --- a/libs/ardour/ardour/cycle_timer.h +++ b/libs/ardour/ardour/cycle_timer.h @@ -48,6 +48,8 @@ class CycleTimer { } _entry = get_cycles(); } +#else + (void) name; #endif } diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 82e5d80244..8c5a7e4abe 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -239,7 +239,11 @@ RouteExportChannel::read (Sample const *& data, framecnt_t frames) const { assert(processor); AudioBuffer const & buffer = processor->get_capture_buffers().get_audio (channel); +#ifndef NDEBUG + (void) frames; +#else assert (frames <= (framecnt_t) buffer.size()); +#endif data = buffer.data(); } diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 9850d82d31..2cd886b03e 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -525,8 +525,8 @@ ARDOUR::set_translations_enabled (bool yn) c = '0'; } - ::write (fd, &c, 1); - ::close (fd); + (void) ::write (fd, &c, 1); + (void) ::close (fd); return true; } diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index 90522a7e06..b5be296b1a 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -678,6 +678,10 @@ PluginManager::lxvst_discover_from_path (string path) vector::iterator x; int ret = 0; +#ifndef NDEBUG + (void) path; +#endif + DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering linuxVST plugins along %1\n", path)); plugin_objects = scanner (lxvst_path, lxvst_filter, 0, false, true); diff --git a/libs/audiographer/audiographer/debuggable.h b/libs/audiographer/audiographer/debuggable.h index 79e0f80dd3..7835849f27 100644 --- a/libs/audiographer/audiographer/debuggable.h +++ b/libs/audiographer/audiographer/debuggable.h @@ -43,12 +43,12 @@ class Debuggable : stream (debug_stream) {} bool debug_level (DebugLevel level) { - #ifdef NDEBUG - level = DEFAULT_DEBUG_LEVEL; /* stop pedantic gcc complaints about unused parameter */ +#ifndef NDEBUG + (void) level; /* stop pedantic gcc complaints about unused parameter */ return false; - #else +#else return L >= level; - #endif +#endif } std::ostream & debug_stream() { return stream; } diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index 86e5b9d54c..d45719036f 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -764,9 +764,6 @@ JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_positio TransportState tstate; switch (state) { - case JackTransportStopped: - tstate = TransportStopped; - break; case JackTransportRolling: tstate = TransportRolling; break; @@ -776,6 +773,10 @@ JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_positio case JackTransportStarting: tstate = TransportStarting; break; + case JackTransportStopped: + default: + tstate = TransportStopped; + break; } return engine.sync_callback (tstate, pos->frame); 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? */ diff --git a/libs/pbd/fpu.cc b/libs/pbd/fpu.cc index 40f8cca9d6..8929491cd9 100644 --- a/libs/pbd/fpu.cc +++ b/libs/pbd/fpu.cc @@ -105,9 +105,9 @@ FPU::FPU () *fxbuf = (char *) malloc (512); assert (*fxbuf); #else - posix_memalign ((void **) &fxbuf, 16, sizeof (char *)); + (void) posix_memalign ((void **) &fxbuf, 16, sizeof (char *)); assert (fxbuf); - posix_memalign ((void **) fxbuf, 16, 512); + (void) posix_memalign ((void **) fxbuf, 16, 512); assert (*fxbuf); #endif diff --git a/libs/pbd/openuri.cc b/libs/pbd/openuri.cc index 45154d0ad1..13d534e760 100644 --- a/libs/pbd/openuri.cc +++ b/libs/pbd/openuri.cc @@ -49,7 +49,7 @@ PBD::open_uri (const char* uri) std::string command = "xdg-open "; command += uri; command += " &"; - system (command.c_str()); + (void) system (command.c_str()); return true; #endif diff --git a/libs/pbd/semutils.cc b/libs/pbd/semutils.cc index 9ac5f60d35..48fdd249f6 100644 --- a/libs/pbd/semutils.cc +++ b/libs/pbd/semutils.cc @@ -35,6 +35,8 @@ ProcessSemaphore::ProcessSemaphore (const char* name, int val) } #else + (void) name; /* stop gcc warning on !Apple systems */ + if (sem_init (&_sem, 0, val)) { throw failed_constructor (); } -- 2.30.2