ScrolledWindow: Bin unreachable ternary branches
authorDaniel Boles <dboles@src.gnome.org>
Tue, 15 Aug 2017 14:15:08 +0000 (15:15 +0100)
committerDaniel Boles <dboles@src.gnome.org>
Tue, 15 Aug 2017 19:32:56 +0000 (20:32 +0100)
We already checked that the child is not NULL above.

Coverity CID 1454191

gtk/gtkscrolledwindow.c

index a0b59dcc7422aa48a0cd9559f5491e705c51efae..400c542b945c593715a0b21c3c33507b5aba518d 100644 (file)
@@ -1540,19 +1540,12 @@ gtk_scrolled_window_allocate (GtkCssGadget        *gadget,
     {
       gint child_scroll_width;
       gint child_scroll_height;
-      GtkScrollablePolicy hscroll_policy;
-      GtkScrollablePolicy vscroll_policy;
       gboolean previous_hvis;
       gboolean previous_vvis;
       guint count = 0;
       GtkScrollable *scrollable_child = GTK_SCROLLABLE (child);
-
-      hscroll_policy = scrollable_child != NULL
-                       ? gtk_scrollable_get_hscroll_policy (scrollable_child)
-                       : GTK_SCROLL_MINIMUM;
-      vscroll_policy = scrollable_child != NULL
-                       ? gtk_scrollable_get_vscroll_policy (scrollable_child)
-                       : GTK_SCROLL_MINIMUM;
+      GtkScrollablePolicy hscroll_policy = gtk_scrollable_get_hscroll_policy (scrollable_child);
+      GtkScrollablePolicy vscroll_policy = gtk_scrollable_get_vscroll_policy (scrollable_child);
 
       /* Determine scrollbar visibility first via hfw apis */
       if (gtk_widget_get_request_mode (child) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH)