From db6aa58267cad3f502f03ab80b9deb6b75320a91 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 10 Nov 2000 17:23:02 +0000 Subject: [PATCH] patched to silence compiler warnings (Martin Lindhe) --- progs/redbook/picksquare.c | 2 +- progs/redbook/wrap.c | 2 +- progs/samples/wave.c | 4 ++-- progs/xdemos/glxheads.c | 4 ++-- src/glu/mesa/nurbscrv.c | 4 ++-- src/glu/mesa/nurbsutl.c | 4 ++-- src/glu/mesa/polytest.c | 4 ++-- src/glut/glx/glut_cursor.c | 2 +- src/glut/glx/glut_dstr.c | 4 ++-- src/glut/glx/glut_gamemode.c | 4 ++-- src/glut/glx/glut_input.c | 2 +- src/glut/glx/glut_menu.c | 6 +++--- src/mesa/drivers/x11/fakeglx.c | 4 ++-- src/mesa/drivers/x11/xfonts.c | 4 ++-- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/progs/redbook/picksquare.c b/progs/redbook/picksquare.c index 0a12aa0facd..b68117c2787 100644 --- a/progs/redbook/picksquare.c +++ b/progs/redbook/picksquare.c @@ -88,7 +88,7 @@ void drawSquares(GLenum mode) 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 c67e04a7f37..f9a1f162ab6 100644 --- a/progs/redbook/wrap.c +++ b/progs/redbook/wrap.c @@ -65,7 +65,7 @@ void makeCheckImage(void) 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 288bea4eb72..7ded49bedcc 100644 --- a/progs/samples/wave.c +++ b/progs/samples/wave.c @@ -186,8 +186,8 @@ static void SetColorMap(void) { 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 a20c72354f1..42bfc835adf 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 @@ AddHead(const char *displayName) 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 a9ff4f28671..5bde023275f 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 @@ do_nurbs_curve(GLUnurbsObj * nobj) 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 516984b3146..027f245827e 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 @@ set_new_t_min_t_max(knot_str_type * geom_knot, knot_str_type * color_knot, 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 0995cb032f0..ccf9cdd4b47 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 @@ cut_out_hole(GLUtriangulatorObj * tobj, 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 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, "=>max_byte1 - fs->min_byte1 + 1; -- 2.30.2