diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-11-10 17:23:02 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-11-10 17:23:02 +0000 |
commit | db6aa58267cad3f502f03ab80b9deb6b75320a91 (patch) | |
tree | 52d7cc352e2e7190b19b79ffdfb21c704b67dff1 /src | |
parent | 8e3366fda795797d92afb6877cd280cf96a6d4e7 (diff) |
patched to silence compiler warnings (Martin Lindhe)
Diffstat (limited to 'src')
-rw-r--r-- | src/glu/mesa/nurbscrv.c | 4 | ||||
-rw-r--r-- | src/glu/mesa/nurbsutl.c | 4 | ||||
-rw-r--r-- | src/glu/mesa/polytest.c | 4 | ||||
-rw-r--r-- | src/glut/glx/glut_cursor.c | 2 | ||||
-rw-r--r-- | src/glut/glx/glut_dstr.c | 4 | ||||
-rw-r--r-- | src/glut/glx/glut_gamemode.c | 4 | ||||
-rw-r--r-- | src/glut/glx/glut_input.c | 2 | ||||
-rw-r--r-- | src/glut/glx/glut_menu.c | 6 | ||||
-rw-r--r-- | src/mesa/drivers/x11/fakeglx.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/x11/xfonts.c | 4 |
10 files changed, 19 insertions, 19 deletions
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, "=><!~"); 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(); diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index cca2fb84a73..ae481755b5f 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 @@ static XVisualInfo *choose_x_visual( Display *dpy, int screen, 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 e0f457a354f..4243f3ff8d1 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 @@ fill_bitmap (Display *dpy, Window win, GC gc, 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; |