--- ray/src/gen/genrev.c	2003/02/22 02:07:23	2.4
+++ ray/src/gen/genrev.c	2003/11/16 10:29:38	2.7
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: genrev.c,v 2.4 2003/02/22 02:07:23 greg Exp $";
+static const char	RCSid[] = "$Id: genrev.c,v 2.7 2003/11/16 10:29:38 schorsch Exp $";
 #endif
 /*
  *  genrev.c - program to generate functions of rotation about z
@@ -11,9 +11,14 @@ static const char	RCSid[] = "$Id: genrev.c,v 2.4 2003/
  *	8/6/86
  */
 
+#include  <stdlib.h>
 #include  <stdio.h>
+#include  <string.h>
 #include  <math.h>
 
+#include  "rterror.h"
+#include  "calcomp.h"
+
 #define  ZNAME		"Z`SYS`"		/* z function name */
 #define  RNAME		"R`SYS`"		/* r function name */
 
@@ -26,16 +31,103 @@ static const char	RCSid[] = "$Id: genrev.c,v 2.4 2003/
 #define  UP		04
 #define  DOWN		010
 
-double  funvalue(), l_hermite(), l_bezier(), l_bspline(), argument();
 
-void	quit(), eputs(), wputs();
+void
+computen(nzp, nrp, z0, r0, z1, r1)		/* compute normal */
+double  *nzp, *nrp, z0, r0, z1, r1;
+{
+	double  dr, dz, len;
 
+	dz = r0 - r1;				/* right angle vector */
+	dr = z1 - z0;
+	len = sqrt(dr*dr + dz*dz);
+	*nzp = dz/len;
+	*nrp = dr/len;
+}
 
+
+void
+eputs(msg)
+char  *msg;
+{
+	fputs(msg, stderr);
+}
+
+
+void
+wputs(msg)
+char  *msg;
+{
+	eputs(msg);
+}
+
+
+void
+quit(code)
+int  code;
+{
+	exit(code);
+}
+
+
+void
+printhead(ac, av)		/* print command header */
+register int  ac;
+register char  **av;
+{
+	putchar('#');
+	while (ac--) {
+		putchar(' ');
+		fputs(*av++, stdout);
+	}
+	putchar('\n');
+}
+
+
+double
+l_hermite(char *nm)
+{
+	double  t;
+	
+	t = argument(5);
+	return(	argument(1)*((2.0*t-3.0)*t*t+1.0) +
+		argument(2)*(-2.0*t+3.0)*t*t +
+		argument(3)*((t-2.0)*t+1.0)*t +
+		argument(4)*(t-1.0)*t*t );
+}
+
+
+double
+l_bezier(char *nm)
+{
+	double  t;
+
+	t = argument(5);
+	return(	argument(1) * (1.+t*(-3.+t*(3.-t))) +
+		argument(2) * 3.*t*(1.+t*(-2.+t)) +
+		argument(3) * 3.*t*t*(1.-t) +
+		argument(4) * t*t*t );
+}
+
+
+double
+l_bspline(char *nm)
+{
+	double  t;
+
+	t = argument(5);
+	return(	argument(1) * (1./6.+t*(-1./2.+t*(1./2.-1./6.*t))) +
+		argument(2) * (2./3.+t*t*(-1.+1./2.*t)) +
+		argument(3) * (1./6.+t*(1./2.+t*(1./2.-1./2.*t))) +
+		argument(4) * (1./6.*t*t*t) );
+}
+
+
+int
 main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	extern long	eclock;
 	char  stmp[256];
 	char  *modname;
 	int  smooth = 0;
@@ -147,100 +239,13 @@ char  *argv[];
 		lastnz = nz; lastnr = nr;
 		nz = nextnz; nr = nextnr;
 	}
-	quit(0);
+	return 0;
 
 userror:
 	fprintf(stderr,
 	"Usage: %s material name z(t) r(t) nseg [-e expr] [-f file] [-s]\n",
 			argv[0]);
-	quit(1);
+	return 1;
 }
 
 
-computen(nzp, nrp, z0, r0, z1, r1)		/* compute normal */
-double  *nzp, *nrp, z0, r0, z1, r1;
-{
-	double  dr, dz, len;
-
-	dz = r0 - r1;				/* right angle vector */
-	dr = z1 - z0;
-	len = sqrt(dr*dr + dz*dz);
-	*nzp = dz/len;
-	*nrp = dr/len;
-}
-
-
-void
-eputs(msg)
-char  *msg;
-{
-	fputs(msg, stderr);
-}
-
-
-void
-wputs(msg)
-char  *msg;
-{
-	eputs(msg);
-}
-
-
-void
-quit(code)
-int  code;
-{
-	exit(code);
-}
-
-
-printhead(ac, av)		/* print command header */
-register int  ac;
-register char  **av;
-{
-	putchar('#');
-	while (ac--) {
-		putchar(' ');
-		fputs(*av++, stdout);
-	}
-	putchar('\n');
-}
-
-
-double
-l_hermite()			
-{
-	double  t;
-	
-	t = argument(5);
-	return(	argument(1)*((2.0*t-3.0)*t*t+1.0) +
-		argument(2)*(-2.0*t+3.0)*t*t +
-		argument(3)*((t-2.0)*t+1.0)*t +
-		argument(4)*(t-1.0)*t*t );
-}
-
-
-double
-l_bezier()
-{
-	double  t;
-
-	t = argument(5);
-	return(	argument(1) * (1.+t*(-3.+t*(3.-t))) +
-		argument(2) * 3.*t*(1.+t*(-2.+t)) +
-		argument(3) * 3.*t*t*(1.-t) +
-		argument(4) * t*t*t );
-}
-
-
-double
-l_bspline()
-{
-	double  t;
-
-	t = argument(5);
-	return(	argument(1) * (1./6.+t*(-1./2.+t*(1./2.-1./6.*t))) +
-		argument(2) * (2./3.+t*t*(-1.+1./2.*t)) +
-		argument(3) * (1./6.+t*(1./2.+t*(1./2.-1./2.*t))) +
-		argument(4) * (1./6.*t*t*t) );
-}