http://www.jwz.org/xscreensaver/xscreensaver-5.12.tar.gz

[xscreensaver] / hacks / glx / polyhedra.c

diff --git a/hacks/glx/polyhedra.c b/hacks/glx/polyhedra.c
index 42017d6b5d10d461b28ae7825dfa7c8858731a43..7fa22b5c5ae1a76828189d32e256422e9ffd8377 100644 (file)
--- a/hacks/glx/polyhedra.c
+++ b/hacks/glx/polyhedra.c
@@ -43,14 +43,17 @@
  *****************************************************************************
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <math.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <math.h>
 #include <stdlib.h>
 #include <errno.h>
 
-#include "config.h"
 #include "polyhedra.h"
 
 extern const char *progname;
@@ -88,23 +91,23 @@ extern const char *progname;
     } while(0)
 
 #define Malloc(lvalue,n,type) do {\
-       if (!(lvalue = (type*) malloc((n) * sizeof(type)))) \
-           Err("out of memory");\
+       if (!(lvalue = (type*) calloc((n), sizeof(type)))) \
+           abort();\
     } while(0)
 
 #define Realloc(lvalue,n,type) do {\
        if (!(lvalue = (type*) realloc(lvalue, (n) * sizeof(type)))) \
-           Err("out of memory");\
+           abort();\
     } while(0)
 
 #define Calloc(lvalue,n,type) do {\
        if (!(lvalue = (type*) calloc(n, sizeof(type))))\
-           Err("out of memory");\
+           abort();\
     } while(0)
 
 #define Matalloc(lvalue,n,m,type) do {\
        if (!(lvalue = (type**) matalloc(n, (m) * sizeof(type))))\
-           Err("out of memory");\
+           abort();\
     } while(0)
 
 #define Sprintfrac(lvalue,x) do {\
@@ -188,7 +191,7 @@ static void *matalloc(int rows, int row_size);
 static Fraction frax;
 
 
-static struct {
+static const struct {
   char *Wythoff, *name, *dual, *group, *class, *dual_class;
   short Coxeter, Wenninger;
 } uniform[] = {
@@ -976,7 +979,7 @@ mod (int i, int j)
 static void
 frac(double x)
 {
-  static Fraction zero = {0,1}, inf = {1,0};
+  static const Fraction zero = {0,1}, inf = {1,0};
   Fraction r0, r;
   long f;
   double s = x;
@@ -1421,7 +1424,7 @@ guessname(Polyhedron *P)
       return dihedral(P, "Dihedron", "Hosohedron");
     }
   } else {/* other nontabulated */
-    static char *pre[] = {"Tetr", "Oct", "Icos"};
+    static const char *pre[] = {"Tetr", "Oct", "Icos"};
     Malloc(P->name, 50, char);
     Malloc(P->dual_name, 50, char);
     sprintf(P->name, "%sahedral ", pre[P->K - 3]);
@@ -1916,7 +1919,7 @@ rotate(Vector vertex, Vector axis, double angle)
               scale(sin(angle), cross(axis, vertex)));
 }
 
-Vector x, y, z;
+static Vector x, y, z;
 
 /*
  * rotate the standard frame
@@ -1924,7 +1927,7 @@ Vector x, y, z;
 static void
 rotframe(double azimuth, double elevation, double angle)
 {
-  static Vector X = {1,0,0}, Y = {0,1,0}, Z = {0,0,1};
+  static const Vector X = {1,0,0}, Y = {0,1,0}, Z = {0,0,1};
   Vector axis;
 
   axis = rotate(rotate (X, Y, elevation), Z, azimuth);
@@ -2260,7 +2263,7 @@ construct_polyhedron (Polyhedron *P, Vector *v, int V, Vector *f, int F,
         facelets++;
 
       } else if (P->even != -1) {
-        if (hit[i]) {
+        if (hit && hit[i]) {
           push_face3 (result, P->incid[3][i], P->incid[0][i],  ii);
           push_face3 (result, P->incid[1][i], P->incid[2][i],  ii);
         } else {
@@ -2415,10 +2418,10 @@ construct_polyhedra (polyhedron ***polyhedra_ret)
 
   int count = 0;
   polyhedron **result;
-  Malloc (result, last_uniform * 2 + 1, polyhedron*);
+  Malloc (result, last_uniform * 2 + 3, polyhedron*);
 
   while (index < last_uniform) {
-    static char sym[4];
+    char sym[4];
     Polyhedron *P;
 
     sprintf(sym, "#%d", index + 1);
@@ -2440,5 +2443,6 @@ construct_polyhedra (polyhedron ***polyhedra_ret)
   }
 
   *polyhedra_ret = result;
+  count++; /* leave room for teapot */
   return count;
 }