Module: Mesa Branch: master Commit: 184e4de3a126fa21945fe59f68b8a29977919fc4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=184e4de3a126fa21945fe59f68b8a29977919fc4
Author: Martin Peres <[email protected]> Date: Fri Jun 5 15:03:19 2015 +0300 main/version: make sure all the output variables get set in get_gl_override This fixes 2 warnings in gcc 5.1. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Signed-off-by: Martin Peres <[email protected]> --- src/mesa/main/version.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 409e5ae..60c7604 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -63,7 +63,7 @@ get_gl_override(gl_api api, int *version, bool *fwd_context, static bool compat_suffix = false; if (api == API_OPENGLES) - return; + goto exit; if (override_version < 0) { override_version = 0; @@ -93,6 +93,7 @@ get_gl_override(gl_api api, int *version, bool *fwd_context, } } +exit: *version = override_version; *fwd_context = fc_suffix; *compat_context = compat_suffix; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
