main/version: make sure all the output variables get set in get_gl_override
authorMartin Peres <martin.peres@linux.intel.com>
Fri, 5 Jun 2015 12:03:19 +0000 (15:03 +0300)
committerMartin Peres <martin.peres@linux.intel.com>
Mon, 8 Jun 2015 09:37:42 +0000 (12:37 +0300)
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

index 409e5ae3cbabf427797f59c7b3bb2b2a7e208e8f..60c76040e2abe1f82f703ae49d26e2c12a0913e8 100644 (file)
@@ -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;