From 3b82de92a0f3a1a810ae1521d2f72795f9d65157 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 8 Jan 2010 22:02:21 -0800 Subject: progs/demos: Add missing initializers in engine.c. --- progs/demos/engine.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'progs') diff --git a/progs/demos/engine.c b/progs/demos/engine.c index 3cf311e..838d28c 100644 --- a/progs/demos/engine.c +++ b/progs/demos/engine.c @@ -120,7 +120,11 @@ static Engine Engines[NUM_ENGINES] = 0.3, /* CrankJournalRadius */ 0.4, /* CrankJournalLength */ 1.5, /* ConnectingRodLength */ - 0.1 /* ConnectingRodThickness */ + 0.1, /* ConnectingRodThickness */ + 0, /* CrankList */ + 0, /* ConnRodList */ + 0, /* PistonList */ + 0 /* BlockList */ }, { "Inline-4", @@ -136,7 +140,11 @@ static Engine Engines[NUM_ENGINES] = 0.3, /* CrankJournalRadius */ 0.4, /* CrankJournalLength */ 1.5, /* ConnectingRodLength */ - 0.1 /* ConnectingRodThickness */ + 0.1, /* ConnectingRodThickness */ + 0, /* CrankList */ + 0, /* ConnRodList */ + 0, /* PistonList */ + 0 /* BlockList */ }, { "Boxer-6", @@ -152,7 +160,11 @@ static Engine Engines[NUM_ENGINES] = 0.3, /* CrankJournalRadius */ 0.4, /* CrankJournalLength */ 1.5, /* ConnectingRodLength */ - 0.1 /* ConnectingRodThickness */ + 0.1, /* ConnectingRodThickness */ + 0, /* CrankList */ + 0, /* ConnRodList */ + 0, /* PistonList */ + 0 /* BlockList */ } }; -- cgit v1.1 From 223c8482ca16d3ed31266ea8cc63b816aece6a81 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 8 Jan 2010 22:10:52 -0800 Subject: progs/glsl: Silence uninitialized variable warning. --- progs/glsl/convolutions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'progs') diff --git a/progs/glsl/convolutions.c b/progs/glsl/convolutions.c index 350e61b..fdfaf56 100644 --- a/progs/glsl/convolutions.c +++ b/progs/glsl/convolutions.c @@ -182,7 +182,7 @@ static void fillConvolution(GLint *k, static void setupConvolution() { GLint *kernel = (GLint*)malloc(sizeof(GLint) * 9); - GLfloat scale; + GLfloat scale = 0.0; GLfloat *vecKer = (GLfloat*)malloc(sizeof(GLfloat) * 9 * 4); GLuint loc; GLuint i; -- cgit v1.1 From 683e3cb8db5a57db2ebd364986a399e2b1009e00 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 8 Jan 2010 23:08:57 -0800 Subject: progs/tests: Silence 'missing initializer' warnings. --- progs/tests/interleave.c | 2 +- progs/tests/texwrap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'progs') diff --git a/progs/tests/interleave.c b/progs/tests/interleave.c index 47bf9df..acf67d0 100644 --- a/progs/tests/interleave.c +++ b/progs/tests/interleave.c @@ -105,7 +105,7 @@ static const unsigned indicies[12] = { 1, 4, 2 }; -#define NONE { NULL, 0, 0, 0 } +#define NONE { NULL, 0, 0, 0, sizeof( NULL ) } #define V2F { v, 2, 2 * sizeof( GLfloat ), GL_FLOAT, sizeof( v[0] ) } #define V3F { v, 3, 3 * sizeof( GLfloat ), GL_FLOAT, sizeof( v[0] ) } #define V4F { v, 4, 4 * sizeof( GLfloat ), GL_FLOAT, sizeof( v[0] ) } diff --git a/progs/tests/texwrap.c b/progs/tests/texwrap.c index 92c8a2f..39c5591 100644 --- a/progs/tests/texwrap.c +++ b/progs/tests/texwrap.c @@ -71,7 +71,7 @@ static struct wrap_mode modes[] = { WRAP_EXT ( GL_MIRROR_CLAMP_TO_EDGE_EXT, "GL_ATI_texture_mirror_once", "GL_EXT_texture_mirror_clamp", 999.0 ), - { 0 } + { 0, NULL, GL_FALSE, 0.0, { NULL, NULL } } }; static void -- cgit v1.1 From 0c7814fe238fe0e2bbeff448c32f79146f9ae923 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 10 Jan 2010 00:40:46 -0800 Subject: progs/demos: Bounds check input to fire.c. --- progs/demos/fire.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'progs') diff --git a/progs/demos/fire.c b/progs/demos/fire.c index f30b893..475582c 100644 --- a/progs/demos/fire.c +++ b/progs/demos/fire.c @@ -726,8 +726,13 @@ main(int ac, char **av) maxage = 1.0 / dt; - if (ac == 2) + if (ac == 2) { np = atoi(av[1]); + if (np <= 0 || np > 1000000) { + fprintf(stderr, "Invalid input.\n"); + exit(-1); + } + } if (ac == 4) { WIDTH = atoi(av[2]); @@ -762,6 +767,7 @@ main(int ac, char **av) assert(np > 0); p = (part *) malloc(sizeof(part) * np); + assert(p); for (i = 0; i < np; i++) setnewpart(&p[i]); -- cgit v1.1 From 199dedd6dd06e7f647dc6741611c06954aca3c77 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 10 Jan 2010 01:57:13 -0800 Subject: progs/demos: Check upper bounds of input in manywin.c. --- progs/xdemos/manywin.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'progs') diff --git a/progs/xdemos/manywin.c b/progs/xdemos/manywin.c index 3b0810b..8ad5c4f 100644 --- a/progs/xdemos/manywin.c +++ b/progs/xdemos/manywin.c @@ -400,6 +400,8 @@ main(int argc, char *argv[]) } if (n < 1) n = 1; + if (n > MAX_HEADS) + n = MAX_HEADS; printf("%d windows\n", n); for (i = 0; i < n; i++) { -- cgit v1.1 From 6d6c9c668894c393f7b6086fe0a4234939656865 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 00:24:39 -0800 Subject: progs/demos: Remove unnecessary header from fbotexture.c. --- progs/demos/fbotexture.c | 1 - 1 file changed, 1 deletion(-) (limited to 'progs') diff --git a/progs/demos/fbotexture.c b/progs/demos/fbotexture.c index 5648266..46bf1c5 100644 --- a/progs/demos/fbotexture.c +++ b/progs/demos/fbotexture.c @@ -14,7 +14,6 @@ #include #include #include -#include #include "extfuncs.h" /* For debug */ -- cgit v1.1 From b4bc20852921f42f0499a174602e87bc3d4495f3 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 19:03:18 -0800 Subject: progs/demos: Remove unnecessary header from isosurf.c. --- progs/demos/isosurf.c | 1 - 1 file changed, 1 deletion(-) (limited to 'progs') diff --git a/progs/demos/isosurf.c b/progs/demos/isosurf.c index dd56965..d9e50a3 100644 --- a/progs/demos/isosurf.c +++ b/progs/demos/isosurf.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #ifdef _WIN32 #include -- cgit v1.1 From f07e87ffba38524a87613d14d01344a3343ec6fb Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 19:15:54 -0800 Subject: progs/tests: Silence fprintf format warning. --- progs/tests/getprocaddress.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'progs') diff --git a/progs/tests/getprocaddress.c b/progs/tests/getprocaddress.c index e699baf..38ca700 100644 --- a/progs/tests/getprocaddress.c +++ b/progs/tests/getprocaddress.c @@ -660,8 +660,8 @@ exercise_CompressedTextures(GLenum dimension) glGetTexLevelParameteriv(dimension, 0, GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB, &queryCompressedSize); if (queryCompressedSize != sizeof(compressedTexture)) { - fprintf(stderr, "%s: compressed 3D texture changed size: expected %d, actual %d\n", - __FUNCTION__, sizeof(compressedTexture), queryCompressedSize); + fprintf(stderr, "%s: compressed 3D texture changed size: expected %lu, actual %d\n", + __FUNCTION__, (unsigned long) sizeof(compressedTexture), queryCompressedSize); return GL_FALSE; } (*GetCompressedTexImageARB)(dimension, 0, queryCompressedData); -- cgit v1.1 From 78ddce9fdada4b09a008b65d91e3e43cfe011459 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 19:29:26 -0800 Subject: progs/demos: Remove unnecessary header from morph3d.c. --- progs/demos/morph3d.c | 1 - 1 file changed, 1 deletion(-) (limited to 'progs') diff --git a/progs/demos/morph3d.c b/progs/demos/morph3d.c index 01a06ab..eab520a 100644 --- a/progs/demos/morph3d.c +++ b/progs/demos/morph3d.c @@ -137,7 +137,6 @@ So the angle is: #endif #include #include -#include #define Scale 0.3 -- cgit v1.1 From 2178abfba344cf5a928418dc192519b3780eb854 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 19:42:55 -0800 Subject: progs/glsl: Remove duplicate included header from shtest.c. --- progs/glsl/shtest.c | 1 - 1 file changed, 1 deletion(-) (limited to 'progs') diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c index 7b1917b..520eccf 100644 --- a/progs/glsl/shtest.c +++ b/progs/glsl/shtest.c @@ -29,7 +29,6 @@ #include -#include #include #include #include -- cgit v1.1 From 7bfa54c6a4fab41c37a593438cc5644c1483ce78 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 19:52:22 -0800 Subject: progs/redbook: Remove unnecessary header from aapoly.c. --- progs/redbook/aapoly.c | 1 - 1 file changed, 1 deletion(-) (limited to 'progs') diff --git a/progs/redbook/aapoly.c b/progs/redbook/aapoly.c index b7b2b27..64d06b7 100644 --- a/progs/redbook/aapoly.c +++ b/progs/redbook/aapoly.c @@ -45,7 +45,6 @@ #include #include #include -#include GLboolean polySmooth = GL_TRUE; -- cgit v1.1 From 6ed607cce69b54e87fcf71d2ac8fa2f6841a7b30 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 19:56:04 -0800 Subject: progs/tests: Add newline to end of printf in vparray.c. --- progs/tests/vparray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'progs') diff --git a/progs/tests/vparray.c b/progs/tests/vparray.c index fe168c6..15673c8 100644 --- a/progs/tests/vparray.c +++ b/progs/tests/vparray.c @@ -183,7 +183,7 @@ static void init_program(void) static const GLfloat bias[4] = {1.0, 1.0, 1.0, 0.0}; if (!glutExtensionSupported("GL_NV_vertex_program")) { - printf("Sorry, this program requires GL_NV_vertex_program"); + printf("Sorry, this program requires GL_NV_vertex_program\n"); exit(1); } -- cgit v1.1 From ae8ed89f2468373a158e74e6cc692d5519429f2f Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 19:57:46 -0800 Subject: progs/tests: Remove duplicate included header in vparray.c. --- progs/tests/vparray.c | 1 - 1 file changed, 1 deletion(-) (limited to 'progs') diff --git a/progs/tests/vparray.c b/progs/tests/vparray.c index 15673c8..75160af 100644 --- a/progs/tests/vparray.c +++ b/progs/tests/vparray.c @@ -8,7 +8,6 @@ #include #include -#include #include #include #include -- cgit v1.1 From 7241f5140fc5eef6e315d48f1b9a1155ecfe3166 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 20:15:59 -0800 Subject: progs/trivial: Remove unnecessary header from tri-fbo-tex-mip.c. --- progs/trivial/tri-fbo-tex-mip.c | 1 - 1 file changed, 1 deletion(-) (limited to 'progs') diff --git a/progs/trivial/tri-fbo-tex-mip.c b/progs/trivial/tri-fbo-tex-mip.c index 0744369..df4725c 100644 --- a/progs/trivial/tri-fbo-tex-mip.c +++ b/progs/trivial/tri-fbo-tex-mip.c @@ -6,7 +6,6 @@ #include #include #include -#include #include /* For debug */ -- cgit v1.1 From 477d51537f8be431cf7158010c1dd2451884dc7f Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 20:21:50 -0800 Subject: progs/trivial: Remove unnecessary headers from tri-fbo-tex.c. --- progs/trivial/tri-fbo-tex.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'progs') diff --git a/progs/trivial/tri-fbo-tex.c b/progs/trivial/tri-fbo-tex.c index 8d1f871..eacb7d5 100644 --- a/progs/trivial/tri-fbo-tex.c +++ b/progs/trivial/tri-fbo-tex.c @@ -6,8 +6,6 @@ #include #include #include -#include -#include /* For debug */ -- cgit v1.1 From 8e9ceb8309f2527ab94c9e09a6c3f0013419b17f Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Mon, 11 Jan 2010 20:24:57 -0800 Subject: progs/xdemos: Remove unnecessary header from corender.c. --- progs/xdemos/corender.c | 1 - 1 file changed, 1 deletion(-) (limited to 'progs') diff --git a/progs/xdemos/corender.c b/progs/xdemos/corender.c index 640c902..e706f4b 100644 --- a/progs/xdemos/corender.c +++ b/progs/xdemos/corender.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include "ipc.h" -- cgit v1.1