Eliminate a warning in a failure case.

third_party/mesa/MesaLib/src/mapi/glapi/gen/gl_apitemp.py

 #!/usr/bin/env python
 
 # (C) Copyright IBM Corporation 2004, 2005
 # All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
 # on the rights to use, copy, modify, merge, publish, distribute, sub
 # license, and/or sell copies of the Software, and to permit persons to whom
@@ skipping 61 matching lines @@
                                 cast = "(const void *) "
                         else:
                                 cast = ""
 
                         t_string = t_string + comma + p.format_string()
                         p_string = p_string + comma + p.name
                         o_string = o_string + comma + cast + p.name
                         comma = ", "
 
 
-                if f.return_type != 'void':
-                        dispatch = "RETURN_DISPATCH"
-                else:
-                        dispatch = "DISPATCH"
-
                 need_proto = False
                 if not f.is_static_entry_point(name):
                         need_proto = True
                 elif self.es:
                         cat, num = api.get_category_for_name(name)
                         if (cat.startswith("es") or cat.startswith("GL_OES")):
                                 need_proto = True
                 if need_proto:
                         print '%s %s KEYWORD2 NAME(%s)(%s);' % (keyword, f.return_type, n, f.get_parameter_string(name))
                         print ''
 
                 print '%s %s KEYWORD2 NAME(%s)(%s)' % (keyword, f.return_type, n, f.get_parameter_string(name))
                 print '{'
-                if p_string == "":
-                        print '   %s(%s, (), (F, "gl%s();\\n"));' \
-                                % (dispatch, f.name, name)
+                if f.return_type != 'void':
+                        dispatch = "RETURN_DISPATCH"
+                        if p_string == "":
+                                print '   %s(%s, %s, (), (F, "gl%s();\\n"));' \
+                                        % (dispatch, f.return_type, f.name, name)
+                        else:
+                                print '   %s(%s, %s, (%s), (F, "gl%s(%s);\\n", %s));' \
+                                        % (dispatch, f.return_type, f.name, p_string, name, t_string, o_string)
                 else:
-                        print '   %s(%s, (%s), (F, "gl%s(%s);\\n", %s));' \
-                                % (dispatch, f.name, p_string, name, t_string, o_string)
+                        dispatch = "DISPATCH"
+                        if p_string == "":
+                                print '   %s(%s, (), (F, "gl%s();\\n"));' \
+                                        % (dispatch, f.name, name)
+                        else:
+                                print '   %s(%s, (%s), (F, "gl%s(%s);\\n", %s));' \
+                                        % (dispatch, f.name, p_string, name, t_string, o_string)
                 print '}'
                 print ''
                 return
 
         def printRealHeader(self):
                 print ''
                 self.printVisibility( "HIDDEN", "hidden" )
                 print """
 /*
  * This file is a template which generates the OpenGL API entry point
  * functions.  It should be included by a .c file which first defines
  * the following macros:
  *   KEYWORD1 - usually nothing, but might be __declspec(dllexport) on Win32
  *   KEYWORD2 - usually nothing, but might be __stdcall on Win32
  *   NAME(n)  - builds the final function name (usually add "gl" prefix)
  *   DISPATCH(func, args, msg) - code to do dispatch of named function.
  *                               msg is a printf-style debug message.
- *   RETURN_DISPATCH(func, args, msg) - code to do dispatch with a return value
+ *   RETURN_DISPATCH(type, func, args, msg) - code to do dispatch with a
+ *                                            return value of type.
  *
  * Here is an example which generates the usual OpenGL functions:
  *   #define KEYWORD1
  *   #define KEYWORD2
  *   #define NAME(func)  gl##func
  *   #define DISPATCH(func, args, msg)                           \\
  *          struct _glapi_table *dispatch = CurrentDispatch;     \\
  *          (*dispatch->func) args
  *   #define RETURN DISPATCH(func, args, msg)                    \\
  *          struct _glapi_table *dispatch = CurrentDispatch;     \\
@@ skipping 177 matching lines @@
         for (arg,val) in args:
                 if arg == "-f":
                         file_name = val
                 elif arg == "-c":
                         es = True
 
         api = gl_XML.parse_GL_API(file_name, glX_XML.glx_item_factory())
 
         printer = PrintGlOffsets(es)
         printer.Print(api)