From ad35ab78ebafdf5fe82ad05f31476d4fa23fcb77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Sun, 21 Feb 2016 21:54:31 +0100 Subject: [PATCH] Fix compilation warnings. (gtk2_ardour part) --- gtk2_ardour/gtk_pianokeyboard.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/gtk_pianokeyboard.c b/gtk2_ardour/gtk_pianokeyboard.c index 8917017960..1b628acd59 100644 --- a/gtk2_ardour/gtk_pianokeyboard.c +++ b/gtk2_ardour/gtk_pianokeyboard.c @@ -247,11 +247,11 @@ key_binding(PianoKeyboard *pk, const char *key) } static void -bind_key(PianoKeyboard *pk, const char *key, int note) +bind_key(PianoKeyboard *pk, char *key, int note) { assert(pk->key_bindings != NULL); - g_hash_table_insert(pk->key_bindings, (const gpointer)key, (gpointer)((intptr_t)note)); + g_hash_table_insert(pk->key_bindings, (gpointer)key, (gpointer)((intptr_t)note)); } static void @@ -686,7 +686,12 @@ piano_keyboard_new(void) pk->note_being_pressed_using_mouse = -1; pk->last_key = 0; pk->monophonic = FALSE; - memset((void *)pk->notes, 0, sizeof(struct PKNote) * NNOTES); + + /* Avoiding memset due to pk->notes being volatile. */ + for (int i = 0; inotes)[i] = 0; + } + pk->key_bindings = g_hash_table_new(g_str_hash, g_str_equal); bind_keys_qwerty(pk);