From 9c46c02c0823fa2709d411ef6026a84214d3c0d5 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 16 Dec 2022 08:25:20 -0300 Subject: [PATCH] Fixing codeql alerts. --- src/dialogs/print/private.h | 2 ++ src/dialogs/save/private.h | 2 ++ src/dialogs/settings/private.h | 77 ++++++++++++++++++++++++++++++++++++++--------------------------------------- src/filetransfer/v3270ft.c | 20 +++++++++----------- src/include/terminal.h | 2 ++ src/include/v3270/accessible.h | 49 ++++++++++++++++++++++++------------------------- src/include/v3270/colorscheme.h | 3 +-- src/include/v3270/tools.h | 20 +++++++++----------- src/terminal/actions/private.h | 2 ++ src/terminal/properties/private.h | 6 ++++-- src/trace/private.h | 52 +++++++++++++++++++++++----------------------------- 11 files changed, 116 insertions(+), 119 deletions(-) diff --git a/src/dialogs/print/private.h b/src/dialogs/print/private.h index 21525c7..f9bce95 100644 --- a/src/dialogs/print/private.h +++ b/src/dialogs/print/private.h @@ -27,6 +27,8 @@ * */ + #pragma once + #include #include #include diff --git a/src/dialogs/save/private.h b/src/dialogs/save/private.h index ad92193..d4384a3 100644 --- a/src/dialogs/save/private.h +++ b/src/dialogs/save/private.h @@ -27,6 +27,8 @@ * */ + #pragma once + #include #include diff --git a/src/dialogs/settings/private.h b/src/dialogs/settings/private.h index 44a0014..bce3158 100644 --- a/src/dialogs/settings/private.h +++ b/src/dialogs/settings/private.h @@ -27,60 +27,59 @@ * */ -#ifndef PRIVATE_H_INCLUDED + #pragma once - #include - #include - #include - #include + #include + #include + #include + #include - /// @brief Toggle button factory. - struct ToggleButtonDefinition { - gint left; - gint top; - gint width; - unsigned short grid; - LIB3270_TOGGLE_ID id; - }; + /// @brief Toggle button factory. + struct ToggleButtonDefinition { + gint left; + gint top; + gint width; + unsigned short grid; + LIB3270_TOGGLE_ID id; + }; - G_GNUC_INTERNAL void v3270_settings_create_toggle_buttons(const struct ToggleButtonDefinition * definitions, size_t length, GtkWidget **grids, GtkToggleButton **toggles); - G_GNUC_INTERNAL void v3270_settings_load_toggle_buttons(const struct ToggleButtonDefinition * definitions, size_t length, GtkWidget *terminal, GtkToggleButton **toggles); - G_GNUC_INTERNAL void v3270_settings_apply_toggle_buttons(const struct ToggleButtonDefinition * definitions, size_t length, GtkWidget *terminal, GtkToggleButton **toggles); + G_GNUC_INTERNAL void v3270_settings_create_toggle_buttons(const struct ToggleButtonDefinition * definitions, size_t length, GtkWidget **grids, GtkToggleButton **toggles); + G_GNUC_INTERNAL void v3270_settings_load_toggle_buttons(const struct ToggleButtonDefinition * definitions, size_t length, GtkWidget *terminal, GtkToggleButton **toggles); + G_GNUC_INTERNAL void v3270_settings_apply_toggle_buttons(const struct ToggleButtonDefinition * definitions, size_t length, GtkWidget *terminal, GtkToggleButton **toggles); - /// @brief Entry field factory. - struct EntryFieldDefinition { + /// @brief Entry field factory. + struct EntryFieldDefinition { - ENTRY_FIELD_HEAD + ENTRY_FIELD_HEAD - unsigned short grid; - gint max_length; - gint width_chars; + unsigned short grid; + gint max_length; + gint width_chars; - }; + }; - G_GNUC_INTERNAL void v3270_settings_create_entry_fields(const struct EntryFieldDefinition * definitions, size_t length, GtkWidget **grids, GtkEntry **entries); + G_GNUC_INTERNAL void v3270_settings_create_entry_fields(const struct EntryFieldDefinition * definitions, size_t length, GtkWidget **grids, GtkEntry **entries); - /// @brief Combo Box factory - struct ComboBoxDefinition { + /// @brief Combo Box factory + struct ComboBoxDefinition { - ENTRY_FIELD_HEAD + ENTRY_FIELD_HEAD - unsigned short grid; + unsigned short grid; - gint n_columns; - const GType *types; + gint n_columns; + const GType *types; - }; + }; - G_GNUC_INTERNAL void v3270_settings_create_combos(const struct ComboBoxDefinition * definitions, size_t length, GtkWidget **grids, GtkComboBox **combos); + G_GNUC_INTERNAL void v3270_settings_create_combos(const struct ComboBoxDefinition * definitions, size_t length, GtkWidget **grids, GtkComboBox **combos); - /// @brief Checkbox factory - struct CheckBoxDefinition { - ENTRY_FIELD_HEAD + /// @brief Checkbox factory + struct CheckBoxDefinition { + ENTRY_FIELD_HEAD - unsigned short grid; - }; + unsigned short grid; + }; - G_GNUC_INTERNAL void v3270_settings_create_checkboxes(const struct CheckBoxDefinition * definitions, size_t length, GtkWidget **grids, GtkToggleButton **buttons); + G_GNUC_INTERNAL void v3270_settings_create_checkboxes(const struct CheckBoxDefinition * definitions, size_t length, GtkWidget **grids, GtkToggleButton **buttons); -#endif // PRIVATE_H_INCLUDED diff --git a/src/filetransfer/v3270ft.c b/src/filetransfer/v3270ft.c index cd4e058..e422654 100644 --- a/src/filetransfer/v3270ft.c +++ b/src/filetransfer/v3270ft.c @@ -103,16 +103,18 @@ static void transfer_type_changed(GtkComboBox *widget, v3270ft *dialog) { // Tem opção seleciona struct v3270ft_entry *entry = v3270ft_get_selected(dialog); - LIB3270_FT_OPTION opt = entry->options & ~(LIB3270_FT_OPTION_SEND|LIB3270_FT_OPTION_RECEIVE|LIB3270_FT_OPTION_ASCII|LIB3270_FT_OPTION_CRLF|LIB3270_FT_OPTION_REMAP); + if(entry) { + LIB3270_FT_OPTION opt = entry->options & ~(LIB3270_FT_OPTION_SEND|LIB3270_FT_OPTION_RECEIVE|LIB3270_FT_OPTION_ASCII|LIB3270_FT_OPTION_CRLF|LIB3270_FT_OPTION_REMAP); - opt |= ft_type[selected].opt; + opt |= ft_type[selected].opt; - entry->type = selected; - debug("Transfer type=%d opt=%08x last=%08x",selected,opt,entry->options); + entry->type = selected; + debug("Transfer type=%d opt=%08x last=%08x",selected,opt,entry->options); - if(entry->options != opt) { - debug("Transfer type=%d opt=%08x",selected,opt); - v3270ft_set_options(GTK_WIDGET(dialog),opt); + if(entry->options != opt) { + debug("Transfer type=%d opt=%08x",selected,opt); + v3270ft_set_options(GTK_WIDGET(dialog),opt); + } } } @@ -290,11 +292,7 @@ static gboolean spin_format(GtkSpinButton *spin, G_GNUC_UNUSED gpointer data) { return TRUE; } -//#ifdef WIN32 -//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 debug("%s: action=%d",__FUNCTION__, (int) GTK_FILE_CHOOSER_ACTION_OPEN); diff --git a/src/include/terminal.h b/src/include/terminal.h index e347c6c..ddc699d 100644 --- a/src/include/terminal.h +++ b/src/include/terminal.h @@ -17,6 +17,8 @@ * along with this program. If not, see . */ + #pragma once + #include #include #include diff --git a/src/include/v3270/accessible.h b/src/include/v3270/accessible.h index 70ebe41..3cade11 100644 --- a/src/include/v3270/accessible.h +++ b/src/include/v3270/accessible.h @@ -27,47 +27,46 @@ * */ -#include + #pragma once -G_BEGIN_DECLS + #include -#define GTK_TYPE_V3270_ACCESSIBLE (v3270_accessible_get_type ()) -#define GTK_V3270_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_V3270_ACCESSIBLE, v3270Accessible)) -#define GTK_V3270_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_V3270_ACCESSIBLE, v3270AccessibleClass)) -#define GTK_IS_V3270_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_V3270_ACCESSIBLE)) -#define GTK_IS_V3270_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_V3270_ACCESSIBLE)) -#define GTK_V3270_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_V3270_ACCESSIBLE, v3270AccessibleClass)) + G_BEGIN_DECLS -typedef struct _v3270Accessible v3270Accessible; -typedef struct _v3270AccessibleClass v3270AccessibleClass; + #define GTK_TYPE_V3270_ACCESSIBLE (v3270_accessible_get_type ()) + #define GTK_V3270_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_V3270_ACCESSIBLE, v3270Accessible)) + #define GTK_V3270_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_V3270_ACCESSIBLE, v3270AccessibleClass)) + #define GTK_IS_V3270_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_V3270_ACCESSIBLE)) + #define GTK_IS_V3270_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_V3270_ACCESSIBLE)) + #define GTK_V3270_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_V3270_ACCESSIBLE, v3270AccessibleClass)) -typedef enum _v3270_state -{ + typedef struct _v3270Accessible v3270Accessible; + typedef struct _v3270AccessibleClass v3270AccessibleClass; + + typedef enum _v3270_state + { V3270_STATE_NONE = 0x0000, V3270_STATE_EDITABLE = 0x0001, V3270_STATE_BUSY = 0x0002, V3270_STATE_ENABLED = 0x0004, V3270_STATE_INVALID_ENTRY = 0x0008, -} V3270_STATE; + } V3270_STATE; -struct _v3270Accessible -{ + struct _v3270Accessible + { GtkAccessible parent; V3270_STATE state; -// AtkLayer layer; -}; + }; -struct _v3270AccessibleClass -{ + struct _v3270AccessibleClass + { GtkAccessibleClass parent_class; + }; + GType v3270_accessible_get_type(void); -}; - -GType v3270_accessible_get_type(void); - -void v3270_acessible_set_state(GtkAccessible *obj, LIB3270_MESSAGE id); + void v3270_acessible_set_state(GtkAccessible *obj, LIB3270_MESSAGE id); -G_END_DECLS + G_END_DECLS diff --git a/src/include/v3270/colorscheme.h b/src/include/v3270/colorscheme.h index f750cfd..ef52970 100644 --- a/src/include/v3270/colorscheme.h +++ b/src/include/v3270/colorscheme.h @@ -27,7 +27,7 @@ * */ -#ifndef V3270_COLOR_SCHEME_H_INCLUDED + #pragma once #include @@ -69,4 +69,3 @@ G_END_DECLS -#endif // V3270_COLOR_SCHEME_H_INCLUDED diff --git a/src/include/v3270/tools.h b/src/include/v3270/tools.h index 7679ca1..377b42d 100644 --- a/src/include/v3270/tools.h +++ b/src/include/v3270/tools.h @@ -27,27 +27,25 @@ * */ -#ifndef V3270_TOOLS_H_INCLUDED + #pragma once #include #include G_BEGIN_DECLS - /// @brief Bind pointer to widget; release it when widget is destroyed. - LIB3270_EXPORT void gtk_widget_bind_ptr(GtkWidget *widget, gpointer ptr); + /// @brief Bind pointer to widget; release it when widget is destroyed. + LIB3270_EXPORT void gtk_widget_bind_ptr(GtkWidget *widget, gpointer ptr); - /// @brief Add style to widget. - LIB3270_EXPORT void gtk_widget_add_class(GtkWidget *widget, const char *className); + /// @brief Add style to widget. + LIB3270_EXPORT void gtk_widget_add_class(GtkWidget *widget, const char *className); - /// @brief Bind file chooser with entry field. - LIB3270_EXPORT void gtk_entry_bind_to_filechooser(GtkWidget *widget, GtkFileChooserAction action, const gchar *title, const gchar *icon_name, const gchar *pattern, const gchar *name); - - /// @brief Bind dialog with toplevel - LIB3270_EXPORT void gtk_dialog_set_toplevel(GtkWidget *dialog, GtkWidget *widget); + /// @brief Bind file chooser with entry field. + LIB3270_EXPORT void gtk_entry_bind_to_filechooser(GtkWidget *widget, GtkFileChooserAction action, const gchar *title, const gchar *icon_name, const gchar *pattern, const gchar *name); + /// @brief Bind dialog with toplevel + LIB3270_EXPORT void gtk_dialog_set_toplevel(GtkWidget *dialog, GtkWidget *widget); G_END_DECLS -#endif // V3270_TOOLS_H_INCLUDED diff --git a/src/terminal/actions/private.h b/src/terminal/actions/private.h index 9c3b0c4..74d423a 100644 --- a/src/terminal/actions/private.h +++ b/src/terminal/actions/private.h @@ -17,6 +17,8 @@ * along with this program. If not, see . */ + #pragma once + #include #include diff --git a/src/terminal/properties/private.h b/src/terminal/properties/private.h index 719689e..e2a8496 100644 --- a/src/terminal/properties/private.h +++ b/src/terminal/properties/private.h @@ -17,11 +17,13 @@ * along with this program. If not, see . */ -#ifdef WIN32 + #pragma once + + #ifdef WIN32 #include #include #include -#endif // WIN32 + #endif // WIN32 #include #include diff --git a/src/trace/private.h b/src/trace/private.h index 3e2cc2b..3d658d6 100644 --- a/src/trace/private.h +++ b/src/trace/private.h @@ -27,44 +27,38 @@ * */ -#ifndef PRIVATE_H_INCLUDED + #pragma once - #include + #include - #include + #include + #ifndef ENABLE_NLS #define ENABLE_NLS + #endif // ENABLE_NLS - #include - #include + #include + #include - #include - #include + #include + #include - #include - #include - #include + #include + #include + #include - /// @brief V3270 Trace Signal list - enum V3270_TRACE_SIGNAL - { - V3270_TRACE_SIGNAL_COMMAND, + /// @brief V3270 Trace Signal list + enum V3270_TRACE_SIGNAL + { + V3270_TRACE_SIGNAL_COMMAND, - V3270_TRACE_SIGNAL_LAST - }; + V3270_TRACE_SIGNAL_LAST + }; - G_GNUC_INTERNAL H3270 * v3270_trace_get_session(GtkWidget *widget); - G_GNUC_INTERNAL GtkWidget * v3270_trace_get_terminal(GtkWidget *widget); - G_GNUC_INTERNAL GtkTextBuffer * v3270_trace_get_text_buffer(GtkWidget *widget); - G_GNUC_INTERNAL GtkScrolledWindow * v3270_trace_get_scrolled_window(GtkWidget *widget); - G_GNUC_INTERNAL void v3270_trace_signal_emit(gpointer instance, enum V3270_TRACE_SIGNAL signal_id, ...); + G_GNUC_INTERNAL H3270 * v3270_trace_get_session(GtkWidget *widget); + G_GNUC_INTERNAL GtkWidget * v3270_trace_get_terminal(GtkWidget *widget); + G_GNUC_INTERNAL GtkTextBuffer * v3270_trace_get_text_buffer(GtkWidget *widget); + G_GNUC_INTERNAL GtkScrolledWindow * v3270_trace_get_scrolled_window(GtkWidget *widget); + G_GNUC_INTERNAL void v3270_trace_signal_emit(gpointer instance, enum V3270_TRACE_SIGNAL signal_id, ...); - G_BEGIN_DECLS - - - G_END_DECLS - - - -#endif // PRIVATE_H_INCLUDED -- libgit2 0.21.2