[PATCH 01/18] Warning fixes in glx

[Keith Packard]

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 glx/glxdri2.c                |  2 +-
 glx/glxdricommon.c           |  2 +-
 glx/indirect_dispatch_swap.c | 12 ------------
 glx/indirect_program.c       | 22 ----------------------
 4 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index b2f3d6e..985f144 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -500,7 +500,7 @@ create_driver_context(__GLXDRIcontext * context,
         unsigned dri_err = 0;
         unsigned major_ver;
         unsigned minor_ver;
-        uint32_t flags;
+        uint32_t flags = 0;
         int reset;
         int api = __DRI_API_OPENGL;
 
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index fc90272..69d4b29 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -226,7 +226,7 @@ glxConvertConfigs(const __DRIcoreExtension * core,
     }
 
     for (i = 0; configs[i]; i++) {
-        int renderType = 0;
+        unsigned int renderType = 0;
         if (core->getConfigAttrib(configs[i], __DRI_ATTRIB_RENDER_TYPE,
                                   &renderType)) {
             if (render_type_is_pbuffer_only(renderType) &&
diff --git a/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c
index 647d0c9..f092b2c 100644
--- a/glx/indirect_dispatch_swap.c
+++ b/glx/indirect_dispatch_swap.c
@@ -81,18 +81,6 @@ bswap_ENUM(const void *src)
     return x.ret;
 }
 
-static GLsync
-bswap_CARD64(const void *src)
-{
-    union {
-        uint64_t dst;
-        GLsync ret;
-    } x;
-
-    x.dst = bswap_64(*(uint64_t *) src);
-    return x.ret;
-}
-
 static GLdouble
 bswap_FLOAT64(const void *src)
 {
diff --git a/glx/indirect_program.c b/glx/indirect_program.c
index fa4a240..d503262 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -122,25 +122,3 @@ __glXDispSwap_GetProgramStringARB(struct __GLXclientStateRec *cl, GLbyte * pc)
 
     return DoGetProgramString(cl, pc, get_program, get_program_string, True);
 }
-
-int
-__glXDisp_GetProgramStringNV(struct __GLXclientStateRec *cl, GLbyte * pc)
-{
-    PFNGLGETPROGRAMIVARBPROC get_program =
-        __glGetProcAddress("glGetProgramivARB");
-    PFNGLGETPROGRAMSTRINGARBPROC get_program_string =
-        __glGetProcAddress("glGetProgramStringARB");
-
-    return DoGetProgramString(cl, pc, get_program, get_program_string, False);
-}
-
-int
-__glXDispSwap_GetProgramStringNV(struct __GLXclientStateRec *cl, GLbyte * pc)
-{
-    PFNGLGETPROGRAMIVARBPROC get_program =
-        __glGetProcAddress("glGetProgramivARB");
-    PFNGLGETPROGRAMSTRINGARBPROC get_program_string =
-        __glGetProcAddress("glGetProgramStringARB");
-
-    return DoGetProgramString(cl, pc, get_program, get_program_string, True);
-}
-- 
1.8.5.2