From 378b5cd7e1f22024d85d5e70954ecf6e86091702 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 24 Jan 2019 09:41:40 -0200 Subject: [PATCH] Fixing warnings and window build. --- src/trace/trace.c | 7 +++++-- src/v3270/callbacks.c | 13 +++++++++++-- src/v3270/linux/iosource.c | 16 +--------------- src/v3270/oia.c | 8 ++++++-- src/v3270/private.h | 2 ++ src/v3270/widget.c | 3 ++- src/v3270/windows/iosource.c | 5 +++++ src/v3270ft/filelist.c | 4 ++-- src/v3270ft/load.c | 4 ++-- src/v3270ft/private.h | 5 +++-- src/v3270ft/select.c | 5 +++-- src/v3270ft/v3270ft.c | 2 +- 12 files changed, 43 insertions(+), 31 deletions(-) diff --git a/src/trace/trace.c b/src/trace/trace.c index 717295c..e2666ce 100644 --- a/src/trace/trace.c +++ b/src/trace/trace.c @@ -394,7 +394,7 @@ static void destroy(GtkWidget *widget) return g_object_new(V3270_TYPE_TRACE, NULL); } - GtkWidget * v3270_new_trace_window(GtkWidget *widget) + LIB3270_EXPORT GtkWidget * v3270_new_trace_window(GtkWidget *widget) { return v3270_trace_new_from_session(v3270_get_session(widget)); } @@ -450,7 +450,7 @@ static void destroy(GtkWidget *widget) gchar * msg; }; - static void bg_trace_vprintf(struct bg_print_data *data) + static gboolean bg_trace_vprintf(struct bg_print_data *data) { GtkTextIter itr; @@ -475,6 +475,9 @@ static void destroy(GtkWidget *widget) //gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(hwnd->scroll), vadj); g_free(data->msg); + + return FALSE; + } void v3270_trace_vprintf(GtkWidget *widget, const char *fmt, va_list args) diff --git a/src/v3270/callbacks.c b/src/v3270/callbacks.c index 8d48b7b..cb13bc1 100644 --- a/src/v3270/callbacks.c +++ b/src/v3270/callbacks.c @@ -28,6 +28,11 @@ */ #include + + #ifdef _WIN32 + #include + #endif // _WIN32 + #include "private.h" #include @@ -132,7 +137,7 @@ static void update_toggle(H3270 *session, LIB3270_TOGGLE ix, unsigned char value } -static void bg_update_message(H3270 *session) +static gboolean bg_update_message(H3270 *session) { void *widget = lib3270_get_user_data(session); trace("-----A %s %p",__FUNCTION__, lib3270_get_user_data(session)); @@ -145,6 +150,8 @@ static void bg_update_message(H3270 *session) ); trace("-----B %s %p",__FUNCTION__, lib3270_get_user_data(session)); + + return FALSE; } static void update_message(H3270 *session, G_GNUC_UNUSED LIB3270_MESSAGE id) @@ -163,7 +170,7 @@ struct select_cursor_data LIB3270_POINTER id; }; -static void bg_select_cursor(struct select_cursor_data *data) +static gboolean bg_select_cursor(struct select_cursor_data *data) { GtkWidget *widget = GTK_WIDGET(lib3270_get_user_data(data->hSession)); @@ -176,6 +183,8 @@ static void bg_select_cursor(struct select_cursor_data *data) GTK_V3270(widget)->pointer_id = data->id; v3270_update_mouse_pointer(widget); } + + return FALSE; } static void select_cursor(H3270 *session, LIB3270_POINTER id) diff --git a/src/v3270/linux/iosource.c b/src/v3270/linux/iosource.c index 6f6d4e2..79202ea 100644 --- a/src/v3270/linux/iosource.c +++ b/src/v3270/linux/iosource.c @@ -91,25 +91,11 @@ GSource * IO_source_new(H3270 *session, int fd, LIB3270_IO_FLAG flag, void(*call return (GSource *) src; } -G_GNUC_INTERNAL void IO_source_set_state(GSource *source, gboolean enable) +void IO_source_set_state(GSource *source, gboolean enable) { ((IO_Source *)source)->enabled = enable; - - /* - if(enable) - { - trace("Polling %d was enabled",((IO_Source *)source)->poll.fd); - g_source_add_poll((GSource *) source,&((IO_Source *)source)->poll); - } - else - { - trace("Polling of %d was disabled",((IO_Source *)source)->poll.fd); - g_source_remove_poll((GSource *) source,&((IO_Source *)source)->poll); - } - */ } - gboolean IO_prepare(G_GNUC_UNUSED GSource *source, G_GNUC_UNUSED gint *timeout) { /* diff --git a/src/v3270/oia.c b/src/v3270/oia.c index 095bbce..0004a08 100644 --- a/src/v3270/oia.c +++ b/src/v3270/oia.c @@ -940,12 +940,16 @@ void v3270_oia_update_text_field(v3270 *terminal, gboolean flag, V3270_OIA_FIELD v3270_queue_draw_area(GTK_WIDGET(terminal),r->x,r->y,r->width,r->height); } +#ifdef KEY_FLAG_ALT void v3270_draw_alt_status(v3270 *terminal) { -#ifdef KEY_FLAG_ALT v3270_oia_update_text_field(terminal,terminal->keyflags & KEY_FLAG_ALT,V3270_OIA_ALT,'A'); -#endif // KEY_FLAG_ALT } +#else +void v3270_draw_alt_status(v3270 G_GNUC_UNUSED(*terminal)) +{ +} +#endif // KEY_FLAG_ALT void v3270_draw_ins_status(v3270 *terminal) { diff --git a/src/v3270/private.h b/src/v3270/private.h index 898bc6c..5bdd946 100644 --- a/src/v3270/private.h +++ b/src/v3270/private.h @@ -229,6 +229,8 @@ G_BEGIN_DECLS G_GNUC_INTERNAL void v3270_oia_update_text_field(v3270 *terminal, gboolean flag, V3270_OIA_FIELD id, const gchar chr); G_GNUC_INTERNAL cairo_t * v3270_oia_set_update_region(v3270 * terminal, GdkRectangle **r, V3270_OIA_FIELD id); + G_GNUC_INTERNAL void v3270_install_callbacks(v3270 *widget); + G_GNUC_INTERNAL struct _v3270_properties { size_t count; // Number of properties. diff --git a/src/v3270/widget.c b/src/v3270/widget.c index 9e6e8d0..9fa40ad 100644 --- a/src/v3270/widget.c +++ b/src/v3270/widget.c @@ -33,6 +33,7 @@ #include #include + #include #if GTK_CHECK_VERSION(3,0,0) #include @@ -509,7 +510,7 @@ static void v3270_class_init(v3270Class *klass) static gboolean activity_tick(v3270 *widget) { - if(widget->activity.disconnect && lib3270_is_connected(widget->host) && ((time(0) - widget->activity.timestamp)/60) >= widget->activity.disconnect) + if(widget->activity.disconnect && lib3270_is_connected(widget->host) && ((guint) ((time(0) - widget->activity.timestamp)/60)) >= widget->activity.disconnect) lib3270_disconnect(widget->host); return TRUE; } diff --git a/src/v3270/windows/iosource.c b/src/v3270/windows/iosource.c index 8fa10f6..060af35 100644 --- a/src/v3270/windows/iosource.c +++ b/src/v3270/windows/iosource.c @@ -86,6 +86,11 @@ GSource * IO_source_new(H3270 *session, int fd, LIB3270_IO_FLAG flag, void(*call return (GSource *) src; } +void IO_source_set_state(GSource *source, gboolean enable) +{ + ((IO_Source *)source)->enabled = enable; +} + static gboolean IO_prepare(G_GNUC_UNUSED GSource *source, G_GNUC_UNUSED gint *timeout) { /* diff --git a/src/v3270ft/filelist.c b/src/v3270ft/filelist.c index 31470b6..5feaa4e 100644 --- a/src/v3270ft/filelist.c +++ b/src/v3270ft/filelist.c @@ -101,8 +101,8 @@ void v3270ft_append_file(GtkWidget *widget, const gchar *filename, gboolean text struct v3270ft_entry * entry = v3270ft_create_entry(); gchar * base = g_path_get_basename(filename); - strncpy(entry->local,filename,FILENAME_MAX); - strncpy(entry->remote,base,FILENAME_MAX); + strncpy(entry->local,filename,ENTRY_FILENAME_LENGTH); + strncpy(entry->remote,base,ENTRY_FILENAME_LENGTH); g_free(base); diff --git a/src/v3270ft/load.c b/src/v3270ft/load.c index 733a318..216c029 100644 --- a/src/v3270ft/load.c +++ b/src/v3270ft/load.c @@ -86,11 +86,11 @@ static void entry_start(G_GNUC_UNUSED GMarkupParseContext *context, const gchar if(!g_ascii_strcasecmp(type,"local")) { - strncpy(info->local,path,sizeof(info->local)); + strncpy(info->local,path,sizeof(info->local)-1); } else if(!g_ascii_strcasecmp(type,"remote")) { - strncpy(info->remote,path,sizeof(info->remote)); + strncpy(info->remote,path,sizeof(info->remote)-1); } diff --git a/src/v3270ft/private.h b/src/v3270ft/private.h index 1b1d997..68960df 100644 --- a/src/v3270ft/private.h +++ b/src/v3270ft/private.h @@ -98,11 +98,12 @@ extern const struct v3270ft_type ft_type[]; extern const struct v3270ft_value ft_value[]; + #define ENTRY_FILENAME_LENGTH FILENAME_MAX struct v3270ft_entry { gint type; ///< Transfer type. gboolean valid; ///< Is dialog content valid? - gchar local[FILENAME_MAX]; ///< Local file name. - gchar remote[FILENAME_MAX]; ///< Remote file name. + gchar local[ENTRY_FILENAME_LENGTH+1]; ///< Local file name. + gchar remote[ENTRY_FILENAME_LENGTH+1]; ///< Remote file name. LIB3270_FT_OPTION options; ///< File Transfer options. guint value[LIB3270_FT_VALUE_COUNT]; ///< File transfer values. }; diff --git a/src/v3270ft/select.c b/src/v3270ft/select.c index 2ae1536..11cbb4a 100644 --- a/src/v3270ft/select.c +++ b/src/v3270ft/select.c @@ -37,6 +37,7 @@ /*--[ Implement ]------------------------------------------------------------------------------------*/ +/* #if defined(_WIN32) struct file { @@ -69,8 +70,8 @@ static gpointer select_file(struct file *fl) { return 0; } - #endif // _WIN32 +*/ 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, ...) { @@ -189,7 +190,7 @@ gchar * v3270ft_select_file(v3270ft *dialog, const gchar *title, const gchar *bu gtk_widget_destroy(chooser); -#endif // defined +#endif // WIN32 return rc; diff --git a/src/v3270ft/v3270ft.c b/src/v3270ft/v3270ft.c index 7e4342f..4c3df79 100644 --- a/src/v3270ft/v3270ft.c +++ b/src/v3270ft/v3270ft.c @@ -290,7 +290,7 @@ static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) { } #ifdef WIN32 -static void select_local_file(GtkButton *button, v3270ft *dialog) { +static void select_local_file(GtkButton G_GNUC_UNUSED(*button), v3270ft *dialog) { #else static void icon_press(G_GNUC_UNUSED GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_pos, G_GNUC_UNUSED GdkEvent *event, v3270ft *dialog) { #endif // WIN32 -- libgit2 0.21.2