From 1bda36e2e9552fdcb9f7778bb9603d3422c7f06e Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 10 Jan 2019 17:12:06 -0200 Subject: [PATCH] Fixing warnings. --- src/dialogs/hostselect.c | 8 ++++---- src/include/v3270.h | 2 +- src/testprogram/testprogram.c | 6 +++--- src/v3270/accessible.c | 14 +++++++------- src/v3270/charset.c | 6 +++--- src/v3270/iocallback.c | 22 +++++++++++----------- src/v3270/keyboard.c | 6 +++--- src/v3270/macros.c | 3 +++ src/v3270/mouse.c | 4 ++-- src/v3270/oia.c | 24 +++++++++++++----------- src/v3270/security.c | 2 +- src/v3270/selection.c | 10 +++++----- src/v3270/widget.c | 26 +++++++++++--------------- src/v3270ft/load.c | 8 ++++---- src/v3270ft/select.c | 2 +- src/v3270ft/transfer.c | 4 ++-- src/v3270ft/v3270ft.c | 30 +++++++++++++++--------------- src/v3270ft/v3270ftprogress.c | 12 ++++++------ 18 files changed, 95 insertions(+), 94 deletions(-) diff --git a/src/dialogs/hostselect.c b/src/dialogs/hostselect.c index 8b474ef..7278091 100644 --- a/src/dialogs/hostselect.c +++ b/src/dialogs/hostselect.c @@ -89,7 +89,7 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ -static void V3270HostSelectWidget_class_init(V3270HostSelectWidgetClass *klass) +static void V3270HostSelectWidget_class_init(G_GNUC_UNUSED V3270HostSelectWidgetClass *klass) { #if GTK_CHECK_VERSION(3,0,0) #else @@ -201,7 +201,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget) gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(widget->combo[1]), renderer, TRUE); gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(widget->combo[1]), renderer, "text", 0, NULL); - for(f=0;fcombo[0],&iter); break; diff --git a/src/include/v3270.h b/src/include/v3270.h index 80aadea..4219fe2 100644 --- a/src/include/v3270.h +++ b/src/include/v3270.h @@ -199,7 +199,7 @@ gchar * v3270_get_copy(GtkWidget *widget); void v3270_set_copy(GtkWidget *widget, const gchar *text); - int v3270_run_script(GtkWidget *widget, const gchar *script); +// int v3270_run_script(GtkWidget *widget, const gchar *script); gchar * v3270_get_text(GtkWidget *widget,int offset, int len); gchar * v3270_get_region(GtkWidget *widget, gint start_pos, gint end_pos, gboolean all); diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c index 56bc1d2..b7dba78 100644 --- a/src/testprogram/testprogram.c +++ b/src/testprogram/testprogram.c @@ -35,7 +35,7 @@ /*---[ Implement ]----------------------------------------------------------------------------------*/ -static gboolean popup_menu(GtkWidget *widget, gboolean selected, gboolean online, GdkEventButton *event, gpointer user_data) { +static gboolean popup_menu(GtkWidget *widget, G_GNUC_UNUSED gboolean selected, gboolean online, G_GNUC_UNUSED GdkEventButton *event, G_GNUC_UNUSED gpointer user_data) { if(!online) return FALSE; @@ -76,7 +76,7 @@ static gboolean popup_menu(GtkWidget *widget, gboolean selected, gboolean online } -static void activate(GtkApplication* app, gpointer user_data) { +static void activate(GtkApplication* app, G_GNUC_UNUSED gpointer user_data) { /* const gchar * search[] = { @@ -91,7 +91,7 @@ static void activate(GtkApplication* app, gpointer user_data) { GtkWidget * window = gtk_application_window_new(app); GtkWidget * terminal = v3270_new(); - gchar * filename = NULL; +// gchar * filename = NULL; GValue val = G_VALUE_INIT; const gchar *url = getenv("LIB3270_DEFAULT_HOST"); diff --git a/src/v3270/accessible.c b/src/v3270/accessible.c index cb435b2..274fbab 100644 --- a/src/v3270/accessible.c +++ b/src/v3270/accessible.c @@ -94,7 +94,7 @@ static void v3270_accessible_focus_event(AtkObject *obj, gboolean focus_in) atk_object_notify_state_change(focus_obj, ATK_STATE_FOCUSED, focus_in); } -static AtkAttributeSet * v3270_accessible_get_attributes (AtkObject *obj) +static AtkAttributeSet * v3270_accessible_get_attributes (G_GNUC_UNUSED AtkObject *obj) { AtkAttributeSet * attributes; AtkAttribute * toolkit = g_new(AtkAttribute, 1); @@ -107,7 +107,7 @@ static AtkAttributeSet * v3270_accessible_get_attributes (AtkObject *obj) return attributes; } -static void v3270_accessible_initialize (AtkObject *obj, gpointer data) +static void v3270_accessible_initialize (AtkObject *obj, G_GNUC_UNUSED gpointer data) { obj->role = ATK_ROLE_TEXT; } @@ -131,12 +131,12 @@ static void v3270_accessible_class_init(v3270AccessibleClass *klass) */ } -static gint v3270_accessible_get_n_actions(AtkAction *action) +static gint v3270_accessible_get_n_actions(G_GNUC_UNUSED AtkAction *action) { return 1; } -static const gchar* v3270_accessible_action_get_name (AtkAction *action, gint i) +static const gchar* v3270_accessible_action_get_name (G_GNUC_UNUSED AtkAction *action, gint i) { if (i != 0) return NULL; @@ -326,7 +326,7 @@ static void v3270_accessible_get_character_extents( AtkText *text, } -static gchar * v3270_accessible_get_text_at_offset(AtkText *atk_text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset) +static gchar * v3270_accessible_get_text_at_offset(AtkText *atk_text, gint offset, AtkTextBoundary boundary_type, G_GNUC_UNUSED gint *start_offset, G_GNUC_UNUSED gint *end_offset) { GtkWidget * widget = gtk_accessible_get_widget(GTK_ACCESSIBLE (atk_text)); H3270 * host; @@ -744,7 +744,7 @@ static gboolean v3270_accessible_grab_focus(AtkComponent *component) return TRUE; } -static AtkLayer v3270_accessible_get_layer (AtkComponent *component) +static AtkLayer v3270_accessible_get_layer (G_GNUC_UNUSED AtkComponent *component) { return ATK_LAYER_WIDGET; } @@ -838,7 +838,7 @@ void v3270_acessible_set_state(GtkAccessible *obj, LIB3270_MESSAGE id) bits = GTK_V3270_ACCESSIBLE(obj)->state ^ state; - for(f=0;fremove++; } -static gboolean IO_prepare(GSource *source, gint *timeout) +static gboolean IO_prepare(G_GNUC_UNUSED GSource *source, G_GNUC_UNUSED gint *timeout) { /* * Called before all the file descriptors are polled. @@ -221,7 +221,7 @@ static gboolean IO_check(GSource *source) return FALSE; } -static gboolean IO_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) +static gboolean IO_dispatch(GSource *source, G_GNUC_UNUSED GSourceFunc callback, G_GNUC_UNUSED gpointer user_data) { /* * Called to dispatch the event source, @@ -239,12 +239,12 @@ static gboolean IO_dispatch(GSource *source, GSourceFunc callback, gpointer user return TRUE; } -static void IO_finalize(GSource *source) +static void IO_finalize(G_GNUC_UNUSED GSource *source) { } -static gboolean IO_closure(gpointer data) +static gboolean IO_closure(G_GNUC_UNUSED gpointer data) { return 0; } @@ -266,7 +266,7 @@ gpointer BgCall(struct bgParameter *p) return 0; } -static int static_Sleep(H3270 *hSession, int seconds) +static int static_Sleep(G_GNUC_UNUSED H3270 *hSession, int seconds) { time_t end = time(0) + seconds; @@ -276,7 +276,7 @@ static int static_Sleep(H3270 *hSession, int seconds) return 0; } -static int static_RunPendingEvents(H3270 *hSession, int wait) +static int static_RunPendingEvents(G_GNUC_UNUSED H3270 *hSession, int wait) { int rc = 0; while(gtk_events_pending()) @@ -291,12 +291,12 @@ static int static_RunPendingEvents(H3270 *hSession, int wait) return rc; } -static void beep(H3270 *session) +static void beep(G_GNUC_UNUSED H3270 *session) { - gdk_beep(); + gdk_display_beep(gdk_display_get_default()); } -void v3270_register_io_handlers(v3270Class *cls) +void v3270_register_io_handlers(G_GNUC_UNUSED v3270Class *cls) { static const struct lib3270_callbacks hdl = { diff --git a/src/v3270/keyboard.c b/src/v3270/keyboard.c index 29698e7..920ba36 100644 --- a/src/v3270/keyboard.c +++ b/src/v3270/keyboard.c @@ -150,7 +150,7 @@ } } - for(f=0; f < G_N_ELEMENTS(keycode);f++) + for(f=0; f < (int) G_N_ELEMENTS(keycode);f++) { if(keycode[f].keyval == event->keyval && state == keycode[f].state) { @@ -178,7 +178,7 @@ gtk_accelerator_parse(key_name,&keyval,&state); - for(f=0; f < G_N_ELEMENTS(keycode);f++) + for(f=0; f < (int) G_N_ELEMENTS(keycode);f++) { if(keycode[f].keyval == keyval && keycode[f].state == state) { @@ -257,7 +257,7 @@ } - void v3270_key_commit(GtkIMContext *imcontext, gchar *str, v3270 *widget) + void v3270_key_commit(G_GNUC_UNUSED GtkIMContext *imcontext, gchar *str, v3270 *widget) { gchar *utf = g_convert((char *) str, -1, lib3270_get_display_charset(widget->host), "UTF-8", NULL, NULL, NULL); diff --git a/src/v3270/macros.c b/src/v3270/macros.c index e870eff..d17cb8e 100644 --- a/src/v3270/macros.c +++ b/src/v3270/macros.c @@ -35,6 +35,7 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ +/* static int v3270_macro_copy(GtkWidget *widget, int argc, const char **argv) { v3270_copy(widget, V3270_SELECT_TEXT, FALSE); @@ -125,3 +126,5 @@ return 0; } +*/ + diff --git a/src/v3270/mouse.c b/src/v3270/mouse.c index cab2b7d..1b226f2 100644 --- a/src/v3270/mouse.c +++ b/src/v3270/mouse.c @@ -132,7 +132,7 @@ void v3270_emit_popup(v3270 *widget, int baddr, GdkEventButton *event) if(handled) return; - gdk_beep(); + gdk_display_beep(gdk_display_get_default()); } static V3270_OIA_FIELD get_field_from_event(v3270 *widget, GdkEventButton *event) @@ -200,7 +200,7 @@ gboolean v3270_button_release_event(GtkWidget *widget, GdkEventButton*event) &handled); if(!handled) - gdk_beep(); + gdk_display_beep(gdk_display_get_default()); } diff --git a/src/v3270/oia.c b/src/v3270/oia.c index b9c4702..de62853 100644 --- a/src/v3270/oia.c +++ b/src/v3270/oia.c @@ -137,7 +137,7 @@ static gint draw_spinner(cairo_t *cr, GdkRectangle *r, GdkRGBA *color, gint step } #endif // HAVE_LIBM -static void setup_cursor_position(GdkRectangle *rect, v3270FontInfo *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) +static void setup_cursor_position(GdkRectangle *rect, v3270FontInfo *metrics, cairo_t *cr, H3270 *host, int cols, G_GNUC_UNUSED GdkRGBA *color) { rect->width = metrics->width * 8; rect->x -= rect->width; @@ -149,7 +149,7 @@ static void setup_cursor_position(GdkRectangle *rect, v3270FontInfo *metrics, ca } } -static void setup_ticking_position(GdkRectangle *rect, v3270FontInfo *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) +static void setup_ticking_position(GdkRectangle *rect, G_GNUC_UNUSED v3270FontInfo *metrics, cairo_t *cr, G_GNUC_UNUSED H3270 *host, G_GNUC_UNUSED int cols, G_GNUC_UNUSED GdkRGBA *color) { char buffer[7]; cairo_text_extents_t extents; @@ -164,14 +164,14 @@ static void setup_ticking_position(GdkRectangle *rect, v3270FontInfo *metrics, c rect->x -= rect->width; } -static void setup_spinner_position(GdkRectangle *rect, v3270FontInfo *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) +static void setup_spinner_position(GdkRectangle *rect, G_GNUC_UNUSED v3270FontInfo *metrics, G_GNUC_UNUSED cairo_t *cr, G_GNUC_UNUSED H3270 *host, G_GNUC_UNUSED int cols, G_GNUC_UNUSED GdkRGBA *color) { rect->width = rect->height; rect->x -= rect->width; // draw_spinner(cr,rect,color,0); } -static void setup_luname_position(GdkRectangle *rect, v3270FontInfo *font, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) +static void setup_luname_position(GdkRectangle *rect, v3270FontInfo *font, cairo_t *cr, H3270 *host, G_GNUC_UNUSED int cols, GdkRGBA *color) { const char *luname = lib3270_get_luname(host); @@ -201,19 +201,21 @@ static void setup_luname_position(GdkRectangle *rect, v3270FontInfo *font, cairo } -static void setup_single_char_right(GdkRectangle *rect, v3270FontInfo *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) +static void setup_single_char_right(GdkRectangle *rect, G_GNUC_UNUSED v3270FontInfo *metrics, G_GNUC_UNUSED cairo_t *cr, G_GNUC_UNUSED H3270 *host, G_GNUC_UNUSED int cols, G_GNUC_UNUSED GdkRGBA *color) { rect->x -= rect->width; + /* #ifdef DEBUG cairo_set_source_rgb(cr,0.1,0.1,0.1); cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height); cairo_fill(cr); #endif +*/ } -static void setup_insert_position(GdkRectangle *rect, v3270FontInfo *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) +static void setup_insert_position(GdkRectangle *rect, G_GNUC_UNUSED v3270FontInfo *metrics, cairo_t *cr, G_GNUC_UNUSED H3270 *host, G_GNUC_UNUSED int cols, G_GNUC_UNUSED GdkRGBA *color) { if(rect->width > rect->height) { @@ -237,7 +239,7 @@ static void setup_insert_position(GdkRectangle *rect, v3270FontInfo *metrics, ca -static void setup_double_char_position(GdkRectangle *rect, v3270FontInfo *metrics, cairo_t *cr, H3270 *host, int cols, GdkRGBA *color) +static void setup_double_char_position(GdkRectangle *rect, G_GNUC_UNUSED v3270FontInfo *metrics, cairo_t *cr, G_GNUC_UNUSED H3270 *host, G_GNUC_UNUSED int cols, G_GNUC_UNUSED GdkRGBA *color) { rect->width <<= 1; rect->x -= rect->width; @@ -339,7 +341,7 @@ static void draw_xbm(cairo_t *cr, GdkRectangle *rect, int width, int height, uns cairo_restore(cr); } -void v3270_draw_ssl_status(cairo_t *cr, H3270 *host, v3270FontInfo *metrics, GdkRGBA *color, GdkRectangle *rect) +void v3270_draw_ssl_status(cairo_t *cr, H3270 *host, G_GNUC_UNUSED v3270FontInfo *metrics, GdkRGBA *color, GdkRectangle *rect) { #ifdef DEBUG cairo_set_source_rgb(cr,0.1,0.1,0.1); @@ -587,7 +589,7 @@ void v3270_draw_oia(cairo_t *cr, H3270 *host, int row, int cols, v3270FontInfo * cairo_rectangle(cr, metrics->left, row, cols*metrics->width, metrics->spacing); cairo_fill(cr); - for(f=0;fterminal->color+V3270_COLOR_OIA_BACKGROUND); #endif - for(f=0;fterminal->oia_rect + id[f]; cairo_rectangle(cr, rect->x, rect->y, rect->width, rect->height); @@ -1071,7 +1073,7 @@ void v3270_stop_timer(GtkWidget *widget) } -void v3270_update_ssl(H3270 *session, LIB3270_SSL_STATE state) +void v3270_update_ssl(H3270 *session, G_GNUC_UNUSED LIB3270_SSL_STATE state) { v3270 * terminal = GTK_V3270(lib3270_get_user_data(session)); cairo_t * cr; diff --git a/src/v3270/security.c b/src/v3270/security.c index 8714570..6338b8a 100644 --- a/src/v3270/security.c +++ b/src/v3270/security.c @@ -279,7 +279,7 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ - G_GNUC_INTERNAL const struct v3270_ssl_status_msg * v3270_get_ssl_status_msg(GtkWidget *widget) + G_GNUC_INTERNAL const struct v3270_ssl_status_msg * v3270_get_ssl_status_msg(G_GNUC_UNUSED GtkWidget *widget) { #ifdef HAVE_LIBSSL int f; diff --git a/src/v3270/selection.c b/src/v3270/selection.c index 4032059..a784480 100644 --- a/src/v3270/selection.c +++ b/src/v3270/selection.c @@ -50,11 +50,11 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ -static void clipboard_clear(GtkClipboard *clipboard, GObject *obj) +static void clipboard_clear(G_GNUC_UNUSED GtkClipboard *clipboard, G_GNUC_UNUSED GObject *obj) { } -static void clipboard_get(GtkClipboard *clipboard, GtkSelectionData *selection, guint target, GObject *obj) +static void clipboard_get(G_GNUC_UNUSED GtkClipboard *clipboard, GtkSelectionData *selection, guint target, GObject *obj) { v3270 * widget = GTK_V3270(obj); @@ -372,7 +372,7 @@ LIB3270_EXPORT void v3270_paste(GtkWidget *widget) #else -static void text_received(GtkClipboard *clipboard, const gchar *text, GtkWidget *widget) +static void text_received(G_GNUC_UNUSED GtkClipboard *clipboard, const gchar *text, GtkWidget *widget) { v3270_paste_string(widget,text,"UTF-8"); } @@ -401,7 +401,7 @@ void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encod if(!buffer) { /* Conversion failed, update special chars and try again */ - int f; + size_t f; static const struct _xlat { @@ -460,7 +460,7 @@ void v3270_paste_string(GtkWidget *widget, const gchar *text, const gchar *encod GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - _( "Can't convert line %d from %s to %s" ),f+1, encoding, charset); + _( "Can't convert line %lu from %s to %s" ),(unsigned long) (f+1), encoding, charset); gtk_window_set_title(GTK_WINDOW(dialog), _( "Charset error" ) ); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),"%s\n%s",error->message, ln[f]); diff --git a/src/v3270/widget.c b/src/v3270/widget.c index 474bbe5..fc80ba9 100644 --- a/src/v3270/widget.c +++ b/src/v3270/widget.c @@ -129,11 +129,11 @@ static void v3270_cursor_draw(v3270 *widget) } -static void v3270_toggle_changed(v3270 *widget,LIB3270_TOGGLE toggle_id, gboolean toggle_state,const gchar *toggle_name) +static void v3270_toggle_changed(G_GNUC_UNUSED v3270 *widget, G_GNUC_UNUSED LIB3270_TOGGLE toggle_id, G_GNUC_UNUSED gboolean toggle_state, G_GNUC_UNUSED const gchar *toggle_name) { } -static void loghandler(H3270 *session, const char *module, int rc, const char *fmt, va_list args) +static void loghandler(G_GNUC_UNUSED H3270 *session, const char *module, int rc, const char *fmt, va_list args) { g_logv(module,rc ? G_LOG_LEVEL_WARNING : G_LOG_LEVEL_MESSAGE, fmt, args); } @@ -226,7 +226,7 @@ void v3270_popup_message(GtkWidget *widget, LIB3270_NOTIFY type , const gchar *t } -gboolean v3270_query_tooltip(GtkWidget *widget, gint x, gint y, gboolean keyboard_tooltip, GtkTooltip *tooltip) +gboolean v3270_query_tooltip(GtkWidget *widget, gint x, gint y, G_GNUC_UNUSED gboolean keyboard_tooltip, GtkTooltip *tooltip) { if(y >= GTK_V3270(widget)->oia_rect->y) { @@ -638,7 +638,7 @@ void v3270_update_font_metrics(v3270 *terminal, cairo_t *cr, int width, int heig terminal->font.left = (width >> 1) - ((size) >> 1); terminal->font.spacing = height / (rows+2); - if(terminal->font.spacing < hFont) + if((int) terminal->font.spacing < hFont) terminal->font.spacing = hFont; size = CONTENTS_HEIGHT(terminal); @@ -658,7 +658,7 @@ static void set_timer(H3270 *session, unsigned char on) } -static void update_toggle(H3270 *session, LIB3270_TOGGLE ix, unsigned char value, LIB3270_TOGGLE_TYPE reason, const char *name) +static void update_toggle(H3270 *session, LIB3270_TOGGLE ix, unsigned char value, G_GNUC_UNUSED LIB3270_TOGGLE_TYPE reason, const char *name) { GtkWidget *widget = GTK_WIDGET(lib3270_get_user_data(session)); @@ -766,9 +766,6 @@ static void ctlr_done(H3270 *session) static void update_connect(H3270 *session, unsigned char connected) { -#ifdef DEBUG - char dbg[1024]; -#endif // DEBUG v3270 *widget = GTK_V3270(lib3270_get_user_data(session)); if(connected) @@ -790,13 +787,13 @@ static void update_connect(H3270 *session, unsigned char connected) gtk_widget_queue_draw(GTK_WIDGET(widget)); } -static void update_screen_size(H3270 *session,unsigned short rows, unsigned short cols) +static void update_screen_size(H3270 *session, G_GNUC_UNUSED unsigned short rows, G_GNUC_UNUSED unsigned short cols) { v3270_reload(GTK_WIDGET(lib3270_get_user_data(session))); gtk_widget_queue_draw(GTK_WIDGET(lib3270_get_user_data(session))); } -static void update_model(H3270 *session, const char *name, int model, int rows, int cols) +static void update_model(H3270 *session, const char *name, int model, G_GNUC_UNUSED int rows, G_GNUC_UNUSED int cols) { if(v3270_properties.model) g_object_notify_by_pspec(G_OBJECT(lib3270_get_user_data(session)), v3270_properties.model); @@ -862,7 +859,7 @@ static void set_selection(H3270 *session, unsigned char status) } -static void update_selection(H3270 *session, int start, int end) +static void update_selection(H3270 *session, G_GNUC_UNUSED int start, G_GNUC_UNUSED int end) { // Selected region changed GtkWidget * widget = GTK_WIDGET(lib3270_get_user_data(session)); @@ -902,8 +899,8 @@ static void release_activity_timer(v3270 *widget) widget->activity.timer = NULL; } -static int popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list args) - { +static void popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title, const char *msg, const char *fmt, va_list args) +{ GtkWidget *terminal = (GtkWidget *) lib3270_get_user_data(session); if(terminal && GTK_IS_V3270(terminal)) { @@ -921,7 +918,6 @@ static int popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title, } - return 0; } const gchar * v3270_default_font = "monospace"; @@ -1395,7 +1391,7 @@ void v3270_set_color_table(GdkRGBA *table, const gchar *colors) { gchar **clr; guint cnt; - int f; + guint f; if(strchr(colors,':')) clr = g_strsplit(colors,":",V3270_COLOR_COUNT+1); diff --git a/src/v3270ft/load.c b/src/v3270ft/load.c index 20e13f2..733a318 100644 --- a/src/v3270ft/load.c +++ b/src/v3270ft/load.c @@ -51,7 +51,7 @@ static LIB3270_FT_OPTION getFlagByName(const gchar *option, const char *optval) if(!g_ascii_strcasecmp(key,ft_option[f].name)) { rc = ft_option[f].opt; - debug("%s=%08lx",key,(unsigned int) rc); + // debug("%s=%08lx",key,(unsigned int) rc); break; } @@ -62,7 +62,7 @@ static LIB3270_FT_OPTION getFlagByName(const gchar *option, const char *optval) return rc; } -static void entry_start(GMarkupParseContext *context, const gchar *element_name, const gchar **names,const gchar **values, struct v3270ft_entry *info, GError **error) { +static void entry_start(G_GNUC_UNUSED GMarkupParseContext *context, const gchar *element_name, const gchar **names,const gchar **values, struct v3270ft_entry *info, GError **error) { int f; @@ -208,7 +208,7 @@ static void element_start(GMarkupParseContext *context, const gchar *element_nam } -static void element_end(GMarkupParseContext *context, const gchar *element_name, void *info, GError **error) { +static void element_end(GMarkupParseContext *context, const gchar *element_name, G_GNUC_UNUSED void *info,G_GNUC_UNUSED GError **error) { if(!(g_ascii_strcasecmp(element_name,"entry") && g_ascii_strcasecmp(element_name,"file"))) { @@ -224,7 +224,7 @@ static void element_end(GMarkupParseContext *context, const gchar *element_name, } -static void validate_item(struct v3270ft_entry *entry, GError *error) { +static void validate_item(struct v3270ft_entry *entry, G_GNUC_UNUSED GError *error) { v3270ft_update_state(entry); } diff --git a/src/v3270ft/select.c b/src/v3270ft/select.c index 56632ad..2ae1536 100644 --- a/src/v3270ft/select.c +++ b/src/v3270ft/select.c @@ -72,7 +72,7 @@ static gpointer select_file(struct file *fl) { #endif // _WIN32 -gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *button, GtkFileChooserAction action, const gchar *filename, const gchar *filter, ...) { +gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *button, GtkFileChooserAction action, G_GNUC_UNUSED const gchar *filename, G_GNUC_UNUSED const gchar *filter, ...) { gchar *rc = NULL; diff --git a/src/v3270ft/transfer.c b/src/v3270ft/transfer.c index f5b8dc7..3c615bd 100644 --- a/src/v3270ft/transfer.c +++ b/src/v3270ft/transfer.c @@ -36,13 +36,13 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ -static gboolean transfer_mapped(GtkWidget *widget, GdkEvent *event, v3270ft *ft) { +static gboolean transfer_mapped(GtkWidget *widget, G_GNUC_UNUSED GdkEvent *event, v3270ft *ft) { v3270ftprogress_set_transfer(widget,ft->active->data); v3270ftprogress_start_transfer(widget); return TRUE; } -static void transfer_complete(GtkWidget *progress, const gchar *primary, const gchar *secondary, v3270ft *ft) { +static void transfer_complete(GtkWidget *progress, G_GNUC_UNUSED const gchar *primary, G_GNUC_UNUSED const gchar *secondary, v3270ft *ft) { debug("%s",__FUNCTION__); diff --git a/src/v3270ft/v3270ft.c b/src/v3270ft/v3270ft.c index 041e117..7e4342f 100644 --- a/src/v3270ft/v3270ft.c +++ b/src/v3270ft/v3270ft.c @@ -138,32 +138,32 @@ static void remote_file_changed(GtkEntry *widget, v3270ft *dialog) { } -static void start_transfer(GtkButton *button, v3270ft *dialog) { +static void start_transfer(G_GNUC_UNUSED GtkButton *button, v3270ft *dialog) { gtk_dialog_response(GTK_DIALOG(dialog),GTK_RESPONSE_APPLY); } -static void select_first(GtkButton *button, v3270ft *dialog) { +static void select_first(G_GNUC_UNUSED GtkButton *button, v3270ft *dialog) { v3270ft_select_first(GTK_WIDGET(dialog)); } -static void select_last(GtkButton *button, v3270ft *dialog) { +static void select_last(G_GNUC_UNUSED GtkButton *button, v3270ft *dialog) { v3270ft_select_last(GTK_WIDGET(dialog)); } -static void select_previous(GtkButton *button, v3270ft *dialog) { +static void select_previous(G_GNUC_UNUSED GtkButton *button, v3270ft *dialog) { v3270ft_select_previous(GTK_WIDGET(dialog)); } -static void select_next(GtkButton *button, v3270ft *dialog) { +static void select_next(G_GNUC_UNUSED GtkButton *button, v3270ft *dialog) { v3270ft_select_next(GTK_WIDGET(dialog)); } -static void insert_file(GtkButton *button, v3270ft *dialog) { +static void insert_file(G_GNUC_UNUSED GtkButton *button, v3270ft *dialog) { dialog->files = g_list_append(dialog->files,v3270ft_create_entry()); v3270ft_select_last(GTK_WIDGET(dialog)); } -static void remove_file(GtkButton *button, v3270ft *dialog) { +static void remove_file(G_GNUC_UNUSED GtkButton *button, v3270ft *dialog) { GList *next = dialog->active->next; @@ -186,7 +186,7 @@ static void remove_file(GtkButton *button, v3270ft *dialog) { } -static void load_file(GtkButton *button, v3270ft *dialog) { +static void load_file(G_GNUC_UNUSED GtkButton *button, v3270ft *dialog) { gchar * filename = v3270ft_select_file( dialog, @@ -205,7 +205,7 @@ static void load_file(GtkButton *button, v3270ft *dialog) { } -static void save_file(GtkButton *button, v3270ft *dialog) { +static void save_file(G_GNUC_UNUSED GtkButton *button, v3270ft *dialog) { gchar * filename = v3270ft_select_file( dialog, @@ -223,7 +223,7 @@ static void save_file(GtkButton *button, v3270ft *dialog) { } -static void option_toggled(GtkToggleButton *togglebutton, v3270ft *ft) { +static void option_toggled(G_GNUC_UNUSED GtkToggleButton *togglebutton, v3270ft *ft) { struct v3270ft_entry * entry = v3270ft_get_selected(ft); @@ -273,7 +273,7 @@ static void spin_changed(GtkWidget *button, v3270ft *ft) { } -static gboolean spin_format(GtkSpinButton *spin, gpointer data) { +static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) { GtkAdjustment * adjustment = gtk_spin_button_get_adjustment (spin); int value = (int)gtk_adjustment_get_value(adjustment); @@ -292,7 +292,7 @@ static gboolean spin_format(GtkSpinButton *spin, gpointer data) { #ifdef WIN32 static void select_local_file(GtkButton *button, v3270ft *dialog) { #else -static void icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent *event, v3270ft *dialog) { +static void icon_press(G_GNUC_UNUSED GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent *event, v3270ft *dialog) { #endif // WIN32 gchar *filename = v3270ft_select_file( @@ -322,7 +322,7 @@ static void icon_press(GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEvent } -static void drag_data_received(GtkWidget *widget, GdkDragContext *context, gint x, gint y, GtkSelectionData *data, guint info, guint time) { +static void drag_data_received(GtkWidget *widget, GdkDragContext *context, G_GNUC_UNUSED gint x, G_GNUC_UNUSED gint y, GtkSelectionData *data, G_GNUC_UNUSED guint info, guint time) { gtk_drag_finish(context, v3270ft_append_selection(widget, data) > 0, FALSE, time); @@ -479,7 +479,7 @@ static void v3270ft_init(v3270ft *dialog) { #if HAVE_GTK_HEADER_BAR widget = gtk_dialog_get_header_bar(GTK_DIALOG(dialog)); - for(f=0;fremote,PATH_MAX); gtk_grid_attach(grid,GTK_WIDGET(dialog->remote),1,2,1,1); - for(f=0;ftimeout = time(NULL)+10; } -static void ft_aborting(H3270 *hSession, void *widget) { +static void ft_aborting(G_GNUC_UNUSED H3270 *hSession, void *widget) { if(widget) { v3270ftprogress_set_header(GTK_WIDGET(widget),_("Aborting transfer")); @@ -726,7 +726,7 @@ static void ft_aborting(H3270 *hSession, void *widget) { } -static void ft_state_changed(H3270 *hSession, LIB3270_FT_STATE state, const char *text, void *widget) { +static void ft_state_changed(G_GNUC_UNUSED H3270 *hSession, G_GNUC_UNUSED LIB3270_FT_STATE state, const char *text, void *widget) { if(widget) { v3270ftprogress_set_header(GTK_WIDGET(widget),gettext(text)); -- libgit2 0.21.2