From b06fef94850391d4848c1125142b58256220d9bf Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 11 Jan 2023 10:14:51 -0300 Subject: [PATCH] Fixing some CodeQL alerts. --- src/objects/application/application.c | 10 +++++++++- src/objects/toolbar/models.c | 1 - src/objects/toolbar/settings.c | 1 - src/objects/window/actions/close.c | 9 --------- src/objects/window/actions/hostproperties.c | 73 ------------------------------------------------------------------------- src/objects/window/actions/sessionproperties.c | 1 - src/objects/window/actions/setcolors.c | 60 ------------------------------------------------------------ src/objects/window/header-settings.c | 32 -------------------------------- 8 files changed, 9 insertions(+), 178 deletions(-) delete mode 100644 src/objects/window/actions/hostproperties.c delete mode 100644 src/objects/window/actions/setcolors.c diff --git a/src/objects/application/application.c b/src/objects/application/application.c index 0aea588..c786b16 100644 --- a/src/objects/application/application.c +++ b/src/objects/application/application.c @@ -23,6 +23,9 @@ #include #include #include +#include +#include +#include enum { PROP_ZERO, @@ -611,7 +614,12 @@ static int loghandler(const H3270 G_GNUC_UNUSED(*hSession), pw3270Application *a return -1; } - FILE *f = fopen(app->logfile,"a"); + int fd = open(app->logfile,O_WRONLY|O_APPEND|O_CREAT,S_IWUSR|S_IRUSR); + if(fd < 0) { + return -1; + } + + FILE *f = fdopen(fd,"a"); if(f) { time_t ltime = time(0); diff --git a/src/objects/toolbar/models.c b/src/objects/toolbar/models.c index 984a9f9..6e4c1a6 100644 --- a/src/objects/toolbar/models.c +++ b/src/objects/toolbar/models.c @@ -210,7 +210,6 @@ static void set_property(GObject *menuitem, GObject *widget) { const struct _contents *model = (const struct _contents *) g_object_get_data(menuitem, I_("pw3270_model_data")); const char *name = (const char *) g_object_get_data(menuitem, I_("pw3270_property_name")); -// debug("%s(%s,%d)",__FUNCTION__,name,model->value); g_object_set(widget,name,model->value,NULL); } diff --git a/src/objects/toolbar/settings.c b/src/objects/toolbar/settings.c index 14fc037..0661e66 100644 --- a/src/objects/toolbar/settings.c +++ b/src/objects/toolbar/settings.c @@ -79,7 +79,6 @@ static const struct _comboboxes { struct _PW3270SettingsPage { GtkWidget * views[2]; -// GtkTreeModel * models[G_N_ELEMENTS(comboboxes)]; GtkWidget * combos[G_N_ELEMENTS(comboboxes)]; }; diff --git a/src/objects/window/actions/close.c b/src/objects/window/actions/close.c index e9d6f65..5a94a13 100644 --- a/src/objects/window/actions/close.c +++ b/src/objects/window/actions/close.c @@ -33,15 +33,6 @@ #include #include -/* -void pw3270_window_close_activated(GSimpleAction G_GNUC_UNUSED(* action), GVariant G_GNUC_UNUSED(*parameter), gpointer window) { - -debug("%s(%p)",__FUNCTION__,window); -gtk_window_close(GTK_WINDOW(window)); - -} -*/ - static void activate(GAction G_GNUC_UNUSED(*action), GVariant G_GNUC_UNUSED(*parameter), GtkWidget *terminal) { debug("%s","Window close action was activated"); diff --git a/src/objects/window/actions/hostproperties.c b/src/objects/window/actions/hostproperties.c deleted file mode 100644 index f7f659a..0000000 --- a/src/objects/window/actions/hostproperties.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270 - * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a - * aplicativos mainframe. Registro no INPI sob o nome G3270. - * - * Copyright (C) <2008> - * - * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob - * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela - * Free Software Foundation. - * - * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER - * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO - * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para - * obter mais detalhes. - * - * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este - * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Este programa está nomeado como - e possui - linhas de código. - * - * Contatos: - * - * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) - * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) - * - */ - -#include "../private.h" -#include -#include -#include -#include - -/* -static GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal); - -GAction * pw3270_action_host_properties_new(void) { - - V3270SimpleAction * action = v3270_dialog_action_new(factory); - - action->name = "host.properties"; - action->group.id = LIB3270_ACTION_GROUP_OFFLINE; - action->icon_name = "network-server"; - action->label = N_("Host properties"); - - return G_ACTION(action); -} - -GtkWidget * factory(V3270SimpleAction G_GNUC_UNUSED(*action), GtkWidget *terminal) { - - GtkWidget * dialog = v3270_settings_dialog_new(); - V3270Settings * settings = GTK_V3270_SETTINGS(v3270_host_settings_new()); - - if(settings->title) - gtk_window_set_title(GTK_WINDOW(dialog), settings->title); - - gtk_container_add(GTK_CONTAINER(dialog), GTK_WIDGET(settings)); - - gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(gtk_widget_get_toplevel(terminal))); - gtk_window_set_modal(GTK_WINDOW(dialog),TRUE); - - v3270_settings_dialog_set_terminal_widget(dialog, terminal); - - g_signal_connect(dialog,"response",G_CALLBACK(v3270_setttings_dialog_response),settings); - - gtk_widget_show_all(dialog); - return dialog; - -} -*/ - diff --git a/src/objects/window/actions/sessionproperties.c b/src/objects/window/actions/sessionproperties.c index 5c3a476..fec8698 100644 --- a/src/objects/window/actions/sessionproperties.c +++ b/src/objects/window/actions/sessionproperties.c @@ -44,7 +44,6 @@ GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal) { size_t ix; GApplication *application = g_application_get_default(); -// GSettings *settings = pw3270_application_get_settings(g_application_get_default()); GtkWidget * dialog = v3270_settings_dialog_new(); gtk_window_set_title(GTK_WINDOW(dialog), action->label); diff --git a/src/objects/window/actions/setcolors.c b/src/objects/window/actions/setcolors.c deleted file mode 100644 index d1e3a1e..0000000 --- a/src/objects/window/actions/setcolors.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270 - * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a - * aplicativos mainframe. Registro no INPI sob o nome G3270. - * - * Copyright (C) <2008> - * - * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob - * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela - * Free Software Foundation. - * - * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER - * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO - * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para - * obter mais detalhes. - * - * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este - * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin - * St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Este programa está nomeado como - e possui - linhas de código. - * - * Contatos: - * - * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) - * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) - * - */ - -/* -#include "../private.h" -#include -#include -#include -#include -#include - -static GtkWidget * factory(V3270SimpleAction *action, GtkWidget *terminal); - -GAction * pw3270_set_color_action_new(void) { - - V3270SimpleAction * action = v3270_dialog_action_new(factory); - - action->name = "set.colors"; - action->icon_name = "gtk-select-color"; - action->label = _("Colors"); - action->tooltip = _("Change terminal colors"); - - return G_ACTION(action); - -} - -GtkWidget * factory(V3270SimpleAction G_GNUC_UNUSED(*action), GtkWidget *terminal) { - - GtkWidget *dialog = v3270_settings_get_edit_dialog(v3270_color_settings_new(),terminal,FALSE); - gtk_widget_show_all(dialog); - return dialog; -} -*/ - diff --git a/src/objects/window/header-settings.c b/src/objects/window/header-settings.c index 3fb2976..68f642f 100644 --- a/src/objects/window/header-settings.c +++ b/src/objects/window/header-settings.c @@ -41,40 +41,8 @@ static void apply(GtkWidget *widget, GSettings *settings, PW3270SettingsPage *pa struct _PW3270SettingsPage { GtkWidget * editor; - /* - GtkWidget * views[3]; - GtkTreeModel * model; - */ }; -/* -static const struct _views { -const char * label; -gint left; -gint top; -gint height; -} views[] = { -{ - .label = N_("Left"), - .left = 0, - .top = 0, - .height = 4 -}, -{ - .label = N_("Right"), - .left = 0, - .top = 6, - .height = 4 -}, -{ - .label = N_("Available"), - .left = 2, - .top = 0, - .height = 10 -} -}; -*/ - /*--[ Implement ]------------------------------------------------------------------------------------*/ GtkWidget * pw3270_header_settings_new() { -- libgit2 0.21.2