[PATCH 2/9] dmx: Fix some "no previous prototype" warnings by making functions static.

[Matt Turner]

On Sat, Sep 17, 2011 at 4:22 AM, Jamey Sharp <jamey at minilop.net> wrote:
> Signed-off-by: Jamey Sharp <jamey at minilop.net>
> ---
>  hw/dmx/glxProxy/glxcmds.c     |   41 ++++++++++++++++++++++++++++++++++++++---
>  hw/dmx/glxProxy/glxscreens.c  |   39 ---------------------------------------
>  hw/dmx/glxProxy/render2swap.c |    2 +-
>  3 files changed, 39 insertions(+), 43 deletions(-)
>
> diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
> index f79264e..a76201d 100644
> --- a/hw/dmx/glxProxy/glxcmds.c
> +++ b/hw/dmx/glxProxy/glxcmds.c
> @@ -59,9 +59,6 @@
>  extern __GLXFBConfig **__glXFBConfigs;
>  extern int            __glXNumFBConfigs;
>
> -extern __GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id );
> -extern __GLXFBConfig *glxLookupFBConfigByVID( VisualID vid );
> -extern __GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen );
>  extern int glxIsExtensionSupported( char *ext );
>  extern int __glXGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
>
> @@ -70,6 +67,44 @@ extern int __glXGetFBConfigsSGIX(__GLXclientState *cl, GLbyte *pc);
>              (x) - dmxScreen->glxErrorBase + __glXerrorBase \
>             : (x) )
>
> +static __GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id )
> +{
> +   int i,j;
> +
> +   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
> +      if ( __glXFBConfigs[j]->id == id)
> +        return __glXFBConfigs[j];
> +   }
> +
> +   return NULL;
> +}
> +
> +static __GLXFBConfig *glxLookupFBConfigByVID( VisualID vid )
> +{
> +   int i,j;
> +
> +   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
> +      if ( __glXFBConfigs[j]->associatedVisualId == vid)
> +        return __glXFBConfigs[j];
> +   }
> +
> +   return NULL;
> +}
> +
> +static __GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen )
> +{
> +   int i;
> +   int j;
> +
> +   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
> +      if ( __glXFBConfigs[j]->id == id)
> +        return __glXFBConfigs[j+screen+1];
> +   }
> +
> +   return NULL;
> +
> +}
> +
>  Display *GetBackEndDisplay( __GLXclientState *cl, int s )
>  {
>    if (! cl->be_displays[s] ) {
> diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c
> index 4cbac66..01e041c 100644
> --- a/hw/dmx/glxProxy/glxscreens.c
> +++ b/hw/dmx/glxProxy/glxscreens.c
> @@ -326,45 +326,6 @@ char *__glXGetServerString( unsigned int name )
>
>  }
>
> -
> -__GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id )
> -{
> -   int i,j;
> -
> -   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
> -      if ( __glXFBConfigs[j]->id == id)
> -        return __glXFBConfigs[j];
> -   }
> -
> -   return NULL;
> -}
> -
> -__GLXFBConfig *glxLookupFBConfigByVID( VisualID vid )
> -{
> -   int i,j;
> -
> -   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
> -      if ( __glXFBConfigs[j]->associatedVisualId == vid)
> -        return __glXFBConfigs[j];
> -   }
> -
> -   return NULL;
> -}
> -
> -__GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen )
> -{
> -   int i;
> -   int j;
> -
> -   for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) {
> -      if ( __glXFBConfigs[j]->id == id)
> -        return __glXFBConfigs[j+screen+1];
> -   }
> -
> -   return NULL;
> -
> -}
> -
>  int glxIsExtensionSupported( char *ext )
>  {
>    return( strstr(ExtensionsString, ext) != NULL );
> diff --git a/hw/dmx/glxProxy/render2swap.c b/hw/dmx/glxProxy/render2swap.c
> index 81bb501..da9b565 100644
> --- a/hw/dmx/glxProxy/render2swap.c
> +++ b/hw/dmx/glxProxy/render2swap.c
> @@ -32,7 +32,7 @@
>  #include "unpack.h"
>  #include "g_disptab.h"
>
> -GLint __glEvalComputeK(GLenum target)
> +static GLint __glEvalComputeK(GLenum target)
>  {
>     switch (target) {
>     case GL_MAP1_VERTEX_4:
> --

Reviewed-by: Matt Turner <mattst88 at gmail.com>