From 184e4de3a126fa21945fe59f68b8a29977919fc4 Mon Sep 17 00:00:00 2001
From: Martin Peres <martin.peres@linux.intel.com>
Date: Fri, 5 Jun 2015 15:03:19 +0300
Subject: [PATCH] main/version: make sure all the output variables get set in
 get_gl_override
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This fixes 2 warnings in gcc 5.1.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
---
 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 409e5ae3cba..60c76040e2a 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;
-- 
2.30.2