From 35536fdea847654ccfbd392035b582775556c59e Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Fri, 25 May 2018 15:56:46 +0300 Subject: [PATCH] general: Stop relying on side effect in warning macros The expression will not be evaluated if the macros are disabled. --- src/nautilus-batch-rename-dialog.c | 5 ++++- src/nautilus-list-view-dnd.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c index 307788746..e35f40ef1 100644 --- a/src/nautilus-batch-rename-dialog.c +++ b/src/nautilus-batch-rename-dialog.c @@ -1704,7 +1704,10 @@ on_motion_notify (GtkWidget *widget, update_row_shadowing (dialog->preselected_row2, FALSE); } - g_return_val_if_fail (gdk_event_get_coords (event, NULL, &y), GDK_EVENT_PROPAGATE); + if (G_UNLIKELY (!gdk_event_get_coords (event, NULL, &y))) + { + g_return_val_if_reached (GDK_EVENT_PROPAGATE); + } if (widget == dialog->result_listbox) { diff --git a/src/nautilus-list-view-dnd.c b/src/nautilus-list-view-dnd.c index a1b64aa54..96dc4bc4f 100644 --- a/src/nautilus-list-view-dnd.c +++ b/src/nautilus-list-view-dnd.c @@ -285,7 +285,10 @@ nautilus_list_view_dnd_drag_begin (NautilusListView *list_view, source_target_list = nautilus_list_model_get_drag_target_list (); } - g_return_val_if_fail (gdk_event_get_coords (event, &x, &y), GDK_EVENT_PROPAGATE); + if (G_UNLIKELY (!gdk_event_get_coords (event, &x, &y))) + { + g_return_val_if_reached (GDK_EVENT_PROPAGATE); + } if (gtk_drag_check_threshold (GTK_WIDGET (list_view->details->tree_view), list_view->details->drag_x,