X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fglknots.c;h=255bc36b488395a51f060ac0766998e942daf957;hb=9c9d475ff889ed8be02e8ce8c17da28b93278fca;hp=81488ac8575822f727bdb1802ef10765b079de6c;hpb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930;p=xscreensaver

diff --git a/hacks/glx/glknots.c b/hacks/glx/glknots.c
index 81488ac8..255bc36b 100644
--- a/hacks/glx/glknots.c
+++ b/hacks/glx/glknots.c
@@ -1,4 +1,4 @@
-/* glknots, Copyright (c) 2003 Jamie Zawinski <jwz@jwz.org>
+/* glknots, Copyright (c) 2003, 2004 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -80,7 +80,7 @@ static char *do_spin;
 static GLfloat speed;
 static Bool do_wander;
 static GLfloat thickness;
-static int segments;
+static unsigned int segments;
 static int duration;
 
 static XrmOptionDescRec opts[] = {
@@ -95,12 +95,12 @@ static XrmOptionDescRec opts[] = {
 };
 
 static argtype vars[] = {
-  {(caddr_t *) &do_spin,   "spin",   "Spin",   DEF_SPIN,   t_String},
-  {(caddr_t *) &do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
-  {(caddr_t *) &speed,     "speed",  "Speed",  DEF_SPEED,  t_Float},
-  {(caddr_t *) &thickness, "thickness", "Thickness",  DEF_THICKNESS, t_Float},
-  {(caddr_t *) &segments,  "segments",  "Segments",   DEF_SEGMENTS,  t_Int},
-  {(caddr_t *) &duration,  "duration",  "Duration",   DEF_DURATION,  t_Int},
+  {&do_spin,   "spin",   "Spin",   DEF_SPIN,   t_String},
+  {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
+  {&speed,     "speed",  "Speed",  DEF_SPEED,  t_Float},
+  {&thickness, "thickness", "Thickness",  DEF_THICKNESS, t_Float},
+  {&segments,  "segments",  "Segments",   DEF_SEGMENTS,  t_Int},
+  {&duration,  "duration",  "Duration",   DEF_DURATION,  t_Int},
 };
 
 ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL};
@@ -114,8 +114,8 @@ make_knot (ModeInfo *mi)
   GLfloat diam = (4 * thickness);
   int faces = (wire ? 3 : 6);
 
-  int i;
-  double x, y, z, ox, oy, oz;
+  unsigned int i;
+  double x, y, z, ox=0, oy=0, oz=0;
   double mu;
 
   double p[9];