patched to silence compiler warnings (Martin Lindhe)

5 files changed, 9 insertions, 9 deletions

diff --git a/src/glut/glx/glut_cursor.c b/src/glut/glx/glut_cursor.c
index 28e95568d64..c0a5a5b7afc 100644
--- a/src/glut/glx/glut_cursor.c
+++ b/src/glut/glx/glut_cursor.c
@@ -118,7 +118,7 @@ void
 __glutSetCursor(GLUTwindow *window)
 {
   int cursor = window->cursor;
-  Cursor xcursor;
+  Cursor xcursor = 0;
 
   if (cursor >= 0 &&
     cursor < sizeof(cursorTable) / sizeof(cursorTable[0])) {
diff --git a/src/glut/glx/glut_dstr.c b/src/glut/glx/glut_dstr.c
index 74643b83be8..46884444986 100644
--- a/src/glut/glx/glut_dstr.c
+++ b/src/glut/glx/glut_dstr.c
@@ -630,7 +630,7 @@ findMatch(FrameBufferMode * fbmodes, int nfbmodes,
 {
   FrameBufferMode *found;
   int *bestScore, *thisScore;
-  int i, j, numok, result, worse, better;
+  int i, j, numok, result = 0, worse, better;
 
   found = NULL;
   numok = 1;            /* "num" capability is indexed from 1,
@@ -760,7 +760,7 @@ parseCriteria(char *word, Criterion * criterion, int *mask,
   Bool * allowDoubleAsSingle)
 {
   char *cstr, *vstr, *response;
-  int comparator, value;
+  int comparator, value = 0;
   int rgb, rgba, acc, acca, count, i;
 
   cstr = strpbrk(word, "=><!~");
diff --git a/src/glut/glx/glut_gamemode.c b/src/glut/glx/glut_gamemode.c
index 004f325a061..729711d96b7 100644
--- a/src/glut/glx/glut_gamemode.c
+++ b/src/glut/glx/glut_gamemode.c
@@ -162,7 +162,7 @@ findMatch(DisplayMode * dmodes, int ndmodes,
 {
   DisplayMode *found;
   int *bestScore, *thisScore;
-  int i, j, numok, result, worse, better;
+  int i, j, numok, result = 0, worse, better;
 
   found = NULL;
   numok = 1;            /* "num" capability is indexed from 1,
@@ -386,7 +386,7 @@ static int
 parseCriteria(char *word, Criterion * criterion)
 {
   char *cstr, *vstr, *response;
-  int comparator, value;
+  int comparator, value = 0;
 
   cstr = strpbrk(word, "=><!~");
   if (cstr) {
diff --git a/src/glut/glx/glut_input.c b/src/glut/glx/glut_input.c
index d012c5ee16a..6f6f41f1d65 100644
--- a/src/glut/glx/glut_input.c
+++ b/src/glut/glx/glut_input.c
@@ -315,7 +315,7 @@ probeDevices(void)
   XButtonInfoPtr b;
   XValuatorInfoPtr v;
   XAxisInfoPtr a;
-  int num_dev, btns, dials;
+  int num_dev = 0, btns = 0, dials = 0;
   int i, j, k;
 #endif /* !_WIN32 */
 
diff --git a/src/glut/glx/glut_menu.c b/src/glut/glx/glut_menu.c
index 0c36d348f46..94ac5167b6d 100644
--- a/src/glut/glx/glut_menu.c
+++ b/src/glut/glx/glut_menu.c
@@ -103,8 +103,8 @@ ifSunCreator(void)
 {
   char *xvendor, *glvendor, *renderer;
   int isSunCreator = 0; /* Until proven that it is. */
-  int savedDisplayMode;
-  char *savedDisplayString;
+  int savedDisplayMode = 0;
+  char *savedDisplayString = 0;
   GLUTwindow *window;
 
 #define VENDOR_SUN "Sun Microsystems"
@@ -158,7 +158,7 @@ menuVisualSetup(void)
   Bool presumablyMesa;
   int layer, nVisuals, i, dummy;
   unsigned long *placeHolders = NULL;
-  int numPlaceHolders;
+  int numPlaceHolders = 0;
   Bool allocateHigh;
 
   allocateHigh = ifSunCreator();