From 9db8be4aa0a1dc09791318c2cd1b321dafbc53c9 Mon Sep 17 00:00:00 2001 From: c vw Date: Mon, 9 Nov 2020 19:07:58 +0100 Subject: [PATCH] Small changes to eliminate compiler warnings. --- about_menu.c | 2 +- encoder_menu.c | 4 ++-- gpio.c | 46 +++++++++++++++++++++++----------------------- oc_menu.c | 2 +- vfo_menu.c | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/about_menu.c b/about_menu.c index 1d33ff1..bd7256b 100644 --- a/about_menu.c +++ b/about_menu.c @@ -57,7 +57,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d void about_menu(GtkWidget *parent) { char text[2048]; - char line[128]; + char line[256]; char addr[64]; char interface_addr[64]; diff --git a/encoder_menu.c b/encoder_menu.c index bde18bf..9a81678 100644 --- a/encoder_menu.c +++ b/encoder_menu.c @@ -501,7 +501,7 @@ void top_encoder_select(int pos) { } static gboolean action_select_cb (GtkWidget *widget, gpointer data) { - int action=(int)data; + int action=GPOINTER_TO_INT(data); switch(encoder) { case 2: e2_encoder_action=action; @@ -519,7 +519,7 @@ void top_encoder_select(int pos) { } static gboolean top_action_select_cb (GtkWidget *widget, gpointer data) { - int action=(int)data; + int action=GPOINTER_TO_INT(data); switch(encoder) { case 2: e2_top_encoder_action=action; diff --git a/gpio.c b/gpio.c index 9fb48e1..d62e604 100644 --- a/gpio.c +++ b/gpio.c @@ -399,7 +399,7 @@ g_print("ptt_released\n"); #endif static int e_function_pressed(void *data) { - int action=(int)data; + int action=GPOINTER_TO_INT(data); g_print("e_function_pressed: %d\n",action); switch(action) { case TUNE: @@ -541,7 +541,7 @@ static unsigned long e2debounce=0; static void e2FunctionAlert() { int level=digitalRead(E2_FUNCTION); if(level==0) { - if(running) g_idle_add(e_function_pressed,(gpointer)e2_sw_action); + if(running) g_idle_add(e_function_pressed,GINT_TO_POINTER(e2_sw_action)); } } @@ -550,7 +550,7 @@ static unsigned long e3debounce=0; static void e3FunctionAlert() { int level=digitalRead(E3_FUNCTION); if(level==0) { - if(running) g_idle_add(e_function_pressed,(gpointer)e3_sw_action); + if(running) g_idle_add(e_function_pressed,GINT_TO_POINTER(e3_sw_action)); } } @@ -559,7 +559,7 @@ static unsigned long e4debounce=0; static void e4FunctionAlert() { int level=digitalRead(E4_FUNCTION); if(level==0) { - if(running) g_idle_add(e_function_pressed,(gpointer)e4_sw_action); + if(running) g_idle_add(e_function_pressed,GINT_TO_POINTER(e4_sw_action)); } } @@ -568,7 +568,7 @@ static unsigned long e5debounce=0; static void e5FunctionAlert() { int level=digitalRead(E5_FUNCTION); if(level==0) { - if(running) g_idle_add(e_function_pressed,(gpointer)e5_sw_action); + if(running) g_idle_add(e_function_pressed,GINT_TO_POINTER(e5_sw_action)); } } @@ -1902,7 +1902,7 @@ int lock_get_state() { static int vfo_encoder_changed(void *data) { if(!locked) { - int pos=(int)data; + int pos=GPOINTER_TO_INT(data); vfo_step(pos); } //free(data); @@ -2207,7 +2207,7 @@ static void encoder_changed(int action,int pos) { } static int e2_encoder_changed(void *data) { - int pos=(int)data; + int pos=GPOINTER_TO_INT(data); if(active_menu==E2_MENU) { encoder_select(pos); } else { @@ -2217,7 +2217,7 @@ static int e2_encoder_changed(void *data) { } static int e3_encoder_changed(void *data) { - int pos=(int)data; + int pos=GPOINTER_TO_INT(data); if(active_menu==E3_MENU) { encoder_select(pos); } else { @@ -2227,7 +2227,7 @@ static int e3_encoder_changed(void *data) { } static int e4_encoder_changed(void *data) { - int pos=(int)data; + int pos=GPOINTER_TO_INT(data); if(active_menu==E4_MENU) { encoder_select(pos); } else { @@ -2237,7 +2237,7 @@ static int e4_encoder_changed(void *data) { } static int e5_encoder_changed(void *data) { - int pos=(int)data; + int pos=GPOINTER_TO_INT(data); if(active_menu==E5_MENU) { encoder_select(pos); } else { @@ -2248,7 +2248,7 @@ static int e5_encoder_changed(void *data) { static int e2_top_encoder_changed(void *data) { - int pos=(int)data; + int pos=GPOINTER_TO_INT(data); if(active_menu==E2_MENU) { encoder_select(pos); } else { @@ -2258,7 +2258,7 @@ static int e2_top_encoder_changed(void *data) { } static int e3_top_encoder_changed(void *data) { - int pos=(int)data; + int pos=GPOINTER_TO_INT(data); if(active_menu==E3_MENU) { encoder_select(pos); } else { @@ -2268,7 +2268,7 @@ static int e3_top_encoder_changed(void *data) { } static int e4_top_encoder_changed(void *data) { - int pos=(int)data; + int pos=GPOINTER_TO_INT(data); if(active_menu==E4_MENU) { encoder_select(pos); } else { @@ -2278,7 +2278,7 @@ static int e4_top_encoder_changed(void *data) { } static int e5_top_encoder_changed(void *data) { - int pos=(int)data; + int pos=GPOINTER_TO_INT(data); if(active_menu==E5_MENU) { encoder_select(pos); } else { @@ -2297,28 +2297,28 @@ static gpointer rotary_encoder_thread(gpointer data) { pos=vfo_encoder_get_pos(); if(pos!=0) { - g_idle_add(vfo_encoder_changed,(gpointer)pos); + g_idle_add(vfo_encoder_changed,GINT_TO_POINTER(pos)); } pos=e2_encoder_get_pos(); if(pos!=0) { - g_idle_add(e2_encoder_changed,(gpointer)pos); + g_idle_add(e2_encoder_changed,GINT_TO_POINTER(pos)); } pos=e3_encoder_get_pos(); if(pos!=0) { - g_idle_add(e3_encoder_changed,(gpointer)pos); + g_idle_add(e3_encoder_changed,GINT_TO_POINTER(pos)); } pos=e4_encoder_get_pos(); if(pos!=0) { - g_idle_add(e4_encoder_changed,(gpointer)pos); + g_idle_add(e4_encoder_changed,GINT_TO_POINTER(pos)); } if(controller==CONTROLLER2_V1 || controller==CONTROLLER2_V2) { pos=e5_encoder_get_pos(); if(pos!=0) { - g_idle_add(e5_encoder_changed,(gpointer)pos); + g_idle_add(e5_encoder_changed,GINT_TO_POINTER(pos)); } } @@ -2326,22 +2326,22 @@ static gpointer rotary_encoder_thread(gpointer data) { if(controller==CONTROLLER2_V2) { pos=e2_top_encoder_get_pos(); if(pos!=0) { - g_idle_add(e2_top_encoder_changed,(gpointer)pos); + g_idle_add(e2_top_encoder_changed,GINT_TO_POINTER(pos)); } pos=e3_top_encoder_get_pos(); if(pos!=0) { - g_idle_add(e3_top_encoder_changed,(gpointer)pos); + g_idle_add(e3_top_encoder_changed,GINT_TO_POINTER(pos)); } pos=e4_top_encoder_get_pos(); if(pos!=0) { - g_idle_add(e4_top_encoder_changed,(gpointer)pos); + g_idle_add(e4_top_encoder_changed,GINT_TO_POINTER(pos)); } pos=e5_top_encoder_get_pos(); if(pos!=0) { - g_idle_add(e5_top_encoder_changed,(gpointer)pos); + g_idle_add(e5_top_encoder_changed,GINT_TO_POINTER(pos)); } } diff --git a/oc_menu.c b/oc_menu.c index df51beb..3342545 100644 --- a/oc_menu.c +++ b/oc_menu.c @@ -224,7 +224,7 @@ g_print("oc_menu: parent=%p\n",parent); BAND *band=band_get_band(i); if(strlen(band->title)>0) { GtkWidget *band_label=gtk_label_new(NULL); - char band_text[16]; + char band_text[24]; sprintf(band_text,"%s",band->title); gtk_label_set_markup(GTK_LABEL(band_label), band_text); //gtk_widget_override_font(band_label, pango_font_description_from_string("Arial 18")); diff --git a/vfo_menu.c b/vfo_menu.c index c868989..038bf23 100644 --- a/vfo_menu.c +++ b/vfo_menu.c @@ -79,7 +79,7 @@ static void squelch_enable_cb(GtkWidget *widget, gpointer data) { static gboolean freqent_select_cb (GtkWidget *widget, gpointer data) { char *str = (char *) data; const char *labelText; - char output[BUF_SIZE], buffer[BUF_SIZE]; + char output[BUF_SIZE+12], buffer[BUF_SIZE]; int len; double mult; long long f; -- 2.45.2