Fix builds with G_DISABLE_ASSERT

Commit 25f416c13d added additional compilation warnings, including
-Werror=return-type. There are several places where this results
in build failures if `g_assert_not_reached()` is disabled at compile
time and the compiler misses a return value.

https://gitlab.gnome.org/GNOME/mutter/issues/447
This commit is contained in:
Florian Müllner
2019-01-25 00:47:44 +01:00
parent de41f3ea28
commit d5a7bbd094
20 changed files with 25 additions and 0 deletions

View File

@ -994,6 +994,7 @@ get_connector_type_name (MetaConnectorType connector_type)
case META_CONNECTOR_TYPE_DSI: return "DSI";
default: g_assert_not_reached ();
}
return NULL;
}
static GList *

View File

@ -37,4 +37,5 @@ meta_monitor_transform_invert (MetaMonitorTransform transform)
return transform;
}
g_assert_not_reached ();
return 0;
}

View File

@ -479,6 +479,7 @@ discrete_steps_to_scroll_direction (unsigned int axis,
return CLUTTER_SCROLL_RIGHT;
g_assert_not_reached ();
return 0;
}
static gboolean

View File

@ -924,6 +924,7 @@ is_cursor_hw_state_valid (MetaCursorSprite *cursor_sprite,
}
g_assert_not_reached ();
return FALSE;
}
#ifdef HAVE_WAYLAND

View File

@ -173,6 +173,7 @@ meta_monitor_transform_to_xrandr (MetaMonitorTransform transform)
}
g_assert_not_reached ();
return 0;
}
static gboolean

View File

@ -70,6 +70,7 @@ get_x11_cogl_winsys_vtable (CoglRenderer *renderer)
break;
}
g_assert_not_reached ();
return NULL;
}
static CoglRenderer *