patched to silence compiler warnings (Martin Lindhe)
diff --git a/progs/redbook/picksquare.c b/progs/redbook/picksquare.c
index 0a12aa0..b68117c 100644
--- a/progs/redbook/picksquare.c
+++ b/progs/redbook/picksquare.c
@@ -88,7 +88,7 @@
void processHits (GLint hits, GLuint buffer[])
{
unsigned int i, j;
- GLuint ii, jj, names, *ptr;
+ GLuint ii = 0, jj = 0, names, *ptr;
printf ("hits = %d\n", hits);
ptr = (GLuint *) buffer;
diff --git a/progs/redbook/wrap.c b/progs/redbook/wrap.c
index c67e04a..f9a1f16 100644
--- a/progs/redbook/wrap.c
+++ b/progs/redbook/wrap.c
@@ -65,7 +65,7 @@
for (i = 0; i < checkImageHeight; i++) {
for (j = 0; j < checkImageWidth; j++) {
- c = ((((i&0x8)==0)^((j&0x8))==0))*255;
+ c = (((i&0x8)==0)^((j&0x8)==0))*255;
checkImage[i][j][0] = (GLubyte) c;
checkImage[i][j][1] = (GLubyte) c;
checkImage[i][j][2] = (GLubyte) c;
diff --git a/progs/samples/wave.c b/progs/samples/wave.c
index 288bea4..7ded49b 100644
--- a/progs/samples/wave.c
+++ b/progs/samples/wave.c
@@ -186,8 +186,8 @@
{
static float green[3] = {0.2, 1.0, 0.2};
static float red[3] = {1.0, 0.2, 0.2};
- float *color, percent;
- GLint *indexes, entries, i, j;
+ float *color = 0, percent;
+ GLint *indexes = 0, entries, i, j;
entries = glutGet(GLUT_WINDOW_COLORMAP_SIZE);
diff --git a/progs/xdemos/glxheads.c b/progs/xdemos/glxheads.c
index a20c723..42bfc83 100644
--- a/progs/xdemos/glxheads.c
+++ b/progs/xdemos/glxheads.c
@@ -1,4 +1,4 @@
-/* $Id: glxheads.c,v 1.1 2000/06/13 19:41:30 brianp Exp $ */
+/* $Id: glxheads.c,v 1.2 2000/11/10 17:23:07 brianp Exp $ */
/*
* Exercise multiple GLX connections on multiple X displays.
@@ -139,7 +139,7 @@
if (!glXMakeCurrent(dpy, win, ctx)) {
Error(displayName, "glXMakeCurrent failed");
printf("glXMakeCurrent failed in Redraw()\n");
- return;
+ return NULL;
}
/* save the info for this head */
diff --git a/src/glu/mesa/nurbscrv.c b/src/glu/mesa/nurbscrv.c
index a9ff4f2..5bde023 100644
--- a/src/glu/mesa/nurbscrv.c
+++ b/src/glu/mesa/nurbscrv.c
@@ -1,4 +1,4 @@
-/* $Id: nurbscrv.c,v 1.2 2000/07/11 14:11:04 brianp Exp $ */
+/* $Id: nurbscrv.c,v 1.3 2000/11/10 17:23:04 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -359,7 +359,7 @@
GLint n_ctrl;
GLfloat *new_geom_ctrl, *new_color_ctrl, *new_normal_ctrl,
*new_texture_ctrl;
- GLfloat *geom_ctrl, *color_ctrl, *normal_ctrl, *texture_ctrl;
+ GLfloat *geom_ctrl = 0, *color_ctrl = 0, *normal_ctrl = 0, *texture_ctrl = 0;
GLint *factors;
GLint i, j;
GLint geom_dim, color_dim = 0, normal_dim = 0, texture_dim = 0;
diff --git a/src/glu/mesa/nurbsutl.c b/src/glu/mesa/nurbsutl.c
index 516984b..027f245 100644
--- a/src/glu/mesa/nurbsutl.c
+++ b/src/glu/mesa/nurbsutl.c
@@ -1,4 +1,4 @@
-/* $Id: nurbsutl.c,v 1.3 2000/07/11 20:39:00 brianp Exp $ */
+/* $Id: nurbsutl.c,v 1.4 2000/11/10 17:23:04 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -130,7 +130,7 @@
knot_str_type * normal_knot, knot_str_type * texture_knot,
GLfloat maximal_min_knot, GLfloat minimal_max_knot)
{
- GLuint t_min, t_max, cnt;
+ GLuint t_min = 0, t_max = 0, cnt = 0;
if (minimal_max_knot - maximal_min_knot < EPSILON) {
/* knot common range empty */
diff --git a/src/glu/mesa/polytest.c b/src/glu/mesa/polytest.c
index 0995cb0..ccf9cdd 100644
--- a/src/glu/mesa/polytest.c
+++ b/src/glu/mesa/polytest.c
@@ -1,4 +1,4 @@
-/* $Id: polytest.c,v 1.3 2000/07/11 14:11:04 brianp Exp $ */
+/* $Id: polytest.c,v 1.4 2000/11/10 17:23:04 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -786,7 +786,7 @@
tess_vertex *v1, *v2, *tmp_vertex;
GLuint vertex1_cnt, vertex2_cnt, tmp_vertex_cnt;
GLuint i, j, k;
- GLenum test;
+ GLenum test = 0;
/* find an edge connecting contour and hole not intersecting any other */
/* edge belonging to either the contour or any of the other holes */
diff --git a/src/glut/glx/glut_cursor.c b/src/glut/glx/glut_cursor.c
index 28e9556..c0a5a5b 100644
--- a/src/glut/glx/glut_cursor.c
+++ b/src/glut/glx/glut_cursor.c
@@ -118,7 +118,7 @@
__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 74643b8..4688444 100644
--- a/src/glut/glx/glut_dstr.c
+++ b/src/glut/glx/glut_dstr.c
@@ -630,7 +630,7 @@
{
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 @@
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 004f325..729711d 100644
--- a/src/glut/glx/glut_gamemode.c
+++ b/src/glut/glx/glut_gamemode.c
@@ -162,7 +162,7 @@
{
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 @@
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 d012c5e..6f6f41f 100644
--- a/src/glut/glx/glut_input.c
+++ b/src/glut/glx/glut_input.c
@@ -315,7 +315,7 @@
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 0c36d34..94ac516 100644
--- a/src/glut/glx/glut_menu.c
+++ b/src/glut/glx/glut_menu.c
@@ -103,8 +103,8 @@
{
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 @@
Bool presumablyMesa;
int layer, nVisuals, i, dummy;
unsigned long *placeHolders = NULL;
- int numPlaceHolders;
+ int numPlaceHolders = 0;
Bool allocateHigh;
allocateHigh = ifSunCreator();
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index cca2fb8..ae48175 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,4 +1,4 @@
-/* $Id: fakeglx.c,v 1.38 2000/10/05 17:38:21 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.39 2000/11/10 17:23:03 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -561,7 +561,7 @@
int preferred_class )
{
XVisualInfo *vis;
- int xclass, visclass;
+ int xclass, visclass = 0;
int depth;
if (rgba) {
diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index e0f457a..4243f3f 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -1,4 +1,4 @@
-/* $Id: xfonts.c,v 1.9 2000/08/22 13:31:04 joukj Exp $ */
+/* $Id: xfonts.c,v 1.10 2000/11/10 17:23:03 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -183,7 +183,7 @@
static XCharStruct *isvalid(XFontStruct *fs, int which)
{
unsigned int rows,pages;
- int byte1,byte2;
+ int byte1 = 0,byte2 = 0;
int i,valid = 1;
rows = fs->max_byte1 - fs->min_byte1 + 1;