[ghex] cleanup: Remove some pointless sanity checks and unused vars
- From: Logan Rathbone <larathbone src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ghex] cleanup: Remove some pointless sanity checks and unused vars
- Date: Tue, 3 May 2022 02:24:02 +0000 (UTC)
commit 34aa7b2b31fe8b813ea5fe5c277816ab7331923d
Author: Logan Rathbone <poprocks gmail com>
Date: Mon May 2 22:08:50 2022 -0400
cleanup: Remove some pointless sanity checks and unused vars
src/ghex-application-window.c | 48 +++----------------------------------------
src/gtkhex.c | 40 ++++--------------------------------
2 files changed, 7 insertions(+), 81 deletions(-)
---
diff --git a/src/ghex-application-window.c b/src/ghex-application-window.c
index b5be0ef..7f46b68 100644
--- a/src/ghex-application-window.c
+++ b/src/ghex-application-window.c
@@ -166,15 +166,9 @@ static void doc_read_ready_cb (GObject *source_object, GAsyncResult *res,
{
\
GtkNotebook *notebook = GTK_NOTEBOOK(self->hex_notebook); \
int i;
\
- g_return_if_fail (GTK_IS_NOTEBOOK (notebook)); \
for (i = gtk_notebook_get_n_pages(notebook) - 1; i >= 0; --i) { \
- GHexNotebookTab *tab;
\
- HexWidget *gh;
\
- gh = HEX_WIDGET(gtk_notebook_get_nth_page (notebook, i)); \
- g_return_if_fail (HEX_IS_WIDGET (gh));
\
- tab = GHEX_NOTEBOOK_TAB(gtk_notebook_get_tab_label (notebook, \
- GTK_WIDGET(gh)));
\
- g_return_if_fail (GHEX_IS_NOTEBOOK_TAB (tab)); \
+ HexWidget *gh;
\
+ gh = HEX_WIDGET(gtk_notebook_get_nth_page (notebook, i)); \
/* !NOTEBOOK_GH_FOREACH_START */
#define NOTEBOOK_GH_FOREACH_END
\
@@ -284,8 +278,6 @@ ghex_application_window_get_current_tab (GHexApplicationWindow *self)
HexWidget *gh;
GHexNotebookTab *tab;
- g_return_val_if_fail (GTK_IS_NOTEBOOK (self->hex_notebook), NULL);
-
notebook = GTK_NOTEBOOK(self->hex_notebook);
gh = HEX_WIDGET(gtk_notebook_get_nth_page (notebook,
gtk_notebook_get_current_page (notebook)));
@@ -308,8 +300,6 @@ ghex_application_window_remove_tab (GHexApplicationWindow *self,
HexWidget *tab_gh;
tab_gh = ghex_notebook_tab_get_hex (tab);
- g_return_if_fail (HEX_IS_WIDGET(tab_gh));
-
page_num = gtk_notebook_page_num (notebook, GTK_WIDGET(tab_gh));
gtk_notebook_remove_page (notebook, page_num);
@@ -321,8 +311,6 @@ file_save (GHexApplicationWindow *self)
{
HexDocument *doc;
- g_return_if_fail (HEX_IS_WIDGET (ACTIVE_GH));
-
doc = hex_widget_get_document (ACTIVE_GH);
g_return_if_fail (HEX_IS_DOCUMENT (doc));
@@ -342,8 +330,6 @@ file_save (GHexApplicationWindow *self)
static void
do_close_window (GHexApplicationWindow *self)
{
- g_return_if_fail (GHEX_IS_APPLICATION_WINDOW (self));
-
gtk_window_set_application (GTK_WINDOW(self), NULL);
}
@@ -353,8 +339,6 @@ close_all_tabs (GHexApplicationWindow *self)
GtkNotebook *notebook = GTK_NOTEBOOK(self->hex_notebook);
int i;
- g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
-
g_debug("%s: %d", __func__, gtk_notebook_get_n_pages (notebook));
for (i = gtk_notebook_get_n_pages(notebook) - 1; i >= 0; --i)
@@ -363,11 +347,8 @@ close_all_tabs (GHexApplicationWindow *self)
HexWidget *gh;
gh = HEX_WIDGET(gtk_notebook_get_nth_page (notebook, i));
- g_return_if_fail (HEX_IS_WIDGET (gh));
-
tab = GHEX_NOTEBOOK_TAB(gtk_notebook_get_tab_label (notebook,
GTK_WIDGET(gh)));
- g_return_if_fail (GHEX_IS_NOTEBOOK_TAB (tab));
ghex_application_window_remove_tab (self, tab);
}
@@ -421,18 +402,13 @@ check_close_window (GHexApplicationWindow *self)
gboolean unsaved_found = FALSE;
int i;
- g_return_if_fail (GTK_IS_NOTEBOOK (notebook));
-
for (i = gtk_notebook_get_n_pages(notebook) - 1; i >= 0; --i)
{
HexWidget *gh;
HexDocument *doc = NULL;
gh = HEX_WIDGET(gtk_notebook_get_nth_page (notebook, i));
- g_return_if_fail (HEX_IS_WIDGET (gh));
-
doc = hex_widget_get_document (gh);
- g_return_if_fail (HEX_IS_DOCUMENT (doc));
if (hex_document_has_changed (doc))
unsaved_found = TRUE;
@@ -558,8 +534,6 @@ close_tab_shortcut_cb (GtkWidget *widget,
GHexApplicationWindow *self = GHEX_APPLICATION_WINDOW(widget);
GHexNotebookTab *tab = ghex_application_window_get_current_tab (self);
- g_return_val_if_fail (GHEX_IS_NOTEBOOK_TAB (tab), FALSE);
-
g_signal_emit_by_name (tab, "close-request");
return TRUE;
@@ -644,8 +618,6 @@ file_saved_cb (HexDocument *doc,
{
GHexApplicationWindow *self = GHEX_APPLICATION_WINDOW(user_data);
- g_return_if_fail (GHEX_IS_APPLICATION_WINDOW (self));
-
ghex_application_window_set_can_save (self, assess_can_save (doc));
}
@@ -653,8 +625,6 @@ static void
document_loaded_or_saved_common (GHexApplicationWindow *self,
HexDocument *doc)
{
- g_return_if_fail (GHEX_IS_APPLICATION_WINDOW (self));
-
/* The appwindow as a whole not interested in any document changes that
* don't pertain to the one that is actually in view.
*/
@@ -667,8 +637,6 @@ document_loaded_or_saved_common (GHexApplicationWindow *self,
static void
file_loaded (HexDocument *doc, GHexApplicationWindow *self)
{
- g_return_if_fail (GHEX_IS_APPLICATION_WINDOW (self));
-
document_loaded_or_saved_common (self, doc);
update_gui_data (self);
}
@@ -767,8 +735,6 @@ pane_close_cb (PaneDialog *pane, gpointer user_data)
{
GHexApplicationWindow *self = GHEX_APPLICATION_WINDOW(user_data);
- g_return_if_fail (PANE_IS_DIALOG (pane));
-
if (ACTIVE_GH)
gtk_widget_grab_focus (GTK_WIDGET(ACTIVE_GH));
@@ -863,8 +829,6 @@ update_gui_data (GHexApplicationWindow *self)
HexDialogVal64 val;
char *titlebar_label;
- g_return_if_fail (GHEX_IS_APPLICATION_WINDOW (self));
-
update_status_message (self);
update_titlebar (self);
@@ -964,8 +928,6 @@ static void
ghex_application_window_set_can_save (GHexApplicationWindow *self,
gboolean can_save)
{
- g_return_if_fail (GHEX_IS_APPLICATION_WINDOW (self));
-
self->can_save = can_save;
gtk_widget_action_set_enabled (GTK_WIDGET(self),
@@ -980,13 +942,11 @@ static void
ghex_application_window_set_insert_mode (GHexApplicationWindow *self,
gboolean insert_mode)
{
- g_return_if_fail (GHEX_IS_APPLICATION_WINDOW (self));
-
self->insert_mode = insert_mode;
NOTEBOOK_GH_FOREACH_START
- hex_widget_set_insert_mode(gh, insert_mode);
+ hex_widget_set_insert_mode (gh, insert_mode);
NOTEBOOK_GH_FOREACH_END
@@ -1062,8 +1022,6 @@ save_as (GtkWidget *widget,
HexDocument *doc;
GFile *default_file;
- g_return_if_fail (HEX_IS_WIDGET (ACTIVE_GH));
-
doc = hex_widget_get_document (ACTIVE_GH);
g_return_if_fail (HEX_IS_DOCUMENT (doc));
diff --git a/src/gtkhex.c b/src/gtkhex.c
index 2b1dfe0..85eb3ad 100644
--- a/src/gtkhex.c
+++ b/src/gtkhex.c
@@ -251,8 +251,6 @@ copy_action (GtkWidget *widget,
{
HexWidget *self = HEX_WIDGET(widget);
- g_return_if_fail (HEX_IS_WIDGET(self));
-
hex_widget_copy_to_clipboard (self);
}
@@ -263,8 +261,6 @@ cut_action (GtkWidget *widget,
{
HexWidget *self = HEX_WIDGET(widget);
- g_return_if_fail (HEX_IS_WIDGET(self));
-
hex_widget_cut_to_clipboard (self);
}
@@ -275,8 +271,6 @@ paste_action (GtkWidget *widget,
{
HexWidget *self = HEX_WIDGET(widget);
- g_return_if_fail (HEX_IS_WIDGET(self));
-
hex_widget_paste_from_clipboard (self);
}
@@ -288,8 +282,7 @@ redo_action (GtkWidget *widget,
HexWidget *self = HEX_WIDGET(widget);
HexChangeData *cd;
- g_return_if_fail (HEX_IS_WIDGET(self));
- g_return_if_fail (HEX_IS_DOCUMENT(self->document));
+ g_return_if_fail (HEX_IS_DOCUMENT (self->document));
if (hex_document_can_redo (self->document))
{
@@ -306,7 +299,6 @@ static void
doc_undo_redo_cb (HexDocument *doc, gpointer user_data)
{
HexWidget *self = HEX_WIDGET(user_data);
- g_return_if_fail (HEX_IS_WIDGET (self));
gtk_widget_action_set_enabled (GTK_WIDGET(self),
"gtkhex.undo", hex_document_can_undo (doc));
@@ -322,8 +314,7 @@ undo_action (GtkWidget *widget,
HexWidget *self = HEX_WIDGET(widget);
HexChangeData *cd;
- g_return_if_fail (HEX_IS_WIDGET(self));
- g_return_if_fail (HEX_IS_DOCUMENT(self->document));
+ g_return_if_fail (HEX_IS_DOCUMENT (self->document));
if (hex_document_can_undo (self->document))
{
@@ -1119,8 +1110,6 @@ hex_draw (GtkDrawingArea *drawing_area,
{
HexWidget *self = HEX_WIDGET(user_data);
- g_return_if_fail (HEX_IS_WIDGET(self));
-
/* Now that we have self->cpl defined, run this function to bump all
* required values:
*/
@@ -1141,7 +1130,6 @@ ascii_draw (GtkDrawingArea *drawing_area,
gpointer user_data)
{
HexWidget *self = HEX_WIDGET(user_data);
- g_return_if_fail(HEX_IS_WIDGET(self));
recalc_displays (self);
allocate_display_buffer (self, VIEW_ASCII);
@@ -1156,7 +1144,6 @@ offsets_draw (GtkDrawingArea *drawing_area,
gpointer user_data)
{
HexWidget *self = HEX_WIDGET(user_data);
- g_return_if_fail(HEX_IS_WIDGET(self));
recalc_displays (self);
render_offsets (self, cr, 0, self->vis_lines);
@@ -1278,8 +1265,6 @@ scroll_cb (GtkEventControllerScroll *controller,
HexWidget *self = HEX_WIDGET (user_data);
double old_value, new_value;
- g_return_val_if_fail (HEX_IS_WIDGET(self), FALSE);
-
old_value = gtk_adjustment_get_value (self->adj);
new_value = old_value + dy;
@@ -1307,9 +1292,6 @@ pressed_gesture_helper (HexWidget *self,
else
widget = self->adisp;
- g_return_if_fail (HEX_IS_WIDGET(self));
- g_return_if_fail (GTK_IS_WIDGET(widget));
-
button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE(gesture));
/* Single-press */
@@ -1355,18 +1337,8 @@ released_gesture_helper (HexWidget *self,
double y,
HexWidgetViewType type)
{
- GtkWidget *widget;
- guint button;
-
- if (type == VIEW_HEX)
- widget = self->xdisp;
- else
- widget = self->adisp;
-
- g_return_if_fail (HEX_IS_WIDGET(self));
- g_return_if_fail (GTK_IS_WIDGET(widget));
-
- button = gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE(gesture));
+ guint button = gtk_gesture_single_get_current_button (
+ GTK_GESTURE_SINGLE(gesture));
/* Single-click */
if (button == GDK_BUTTON_PRIMARY && n_press == 1)
@@ -1440,9 +1412,6 @@ drag_update_helper (HexWidget *self,
else
widget = self->adisp;
- g_return_if_fail (HEX_IS_WIDGET(self));
- g_return_if_fail (GTK_IS_WIDGET(widget));
-
gtk_widget_get_allocation (widget, &allocation);
gtk_gesture_drag_get_start_point (gesture, &start_x, &start_y);
@@ -2336,7 +2305,6 @@ document_changed_cb (HexDocument* doc, gpointer change_data,
gboolean push_undo, gpointer data)
{
HexWidget *self = HEX_WIDGET(data);
- g_return_if_fail (HEX_IS_WIDGET (self));
hex_widget_real_data_changed (self, change_data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
