--- ray/src/common/xf.c	1991/07/15 11:28:41	1.10
+++ ray/src/common/xf.c	2003/02/25 02:47:22	2.5
@@ -1,20 +1,19 @@
-/* Copyright (c) 1990 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: xf.c,v 2.5 2003/02/25 02:47:22 greg Exp $";
 #endif
-
 /*
  *  xf.c - routines to convert transform arguments into 4X4 matrix.
  *
- *     1/28/86
+ *  External symbols declared in standard.h
  */
 
+#include "copyright.h"
+
 #include  "standard.h"
 
 #define  d2r(a)		((PI/180.)*(a))
 
-#define  checkarg(a,n)	if (av[i][a] || i+n >= ac) goto done
+#define  checkarg(a,l)	if (av[i][a] || badarg(ac-i-1,av+i+1,l)) goto done
 
 
 int
@@ -23,8 +22,7 @@ register XF  *ret;
 int  ac;
 char  *av[];
 {
-	double  atof(), sin(), cos();
-	double  xfmat[4][4], m4[4][4];
+	MAT4  xfmat, m4;
 	double  xfsca, dtmp;
 	int  i, icnt;
 
@@ -42,7 +40,7 @@ char  *av[];
 		switch (av[i][1]) {
 	
 		case 't':			/* translate */
-			checkarg(2,3);
+			checkarg(2,"fff");
 			m4[3][0] = atof(av[++i]);
 			m4[3][1] = atof(av[++i]);
 			m4[3][2] = atof(av[++i]);
@@ -51,30 +49,30 @@ char  *av[];
 		case 'r':			/* rotate */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,1);
+				checkarg(3,"f");
 				dtmp = d2r(atof(av[++i]));
 				m4[1][1] = m4[2][2] = cos(dtmp);
 				m4[2][1] = -(m4[1][2] = sin(dtmp));
 				break;
 			case 'y':
-				checkarg(3,1);
+				checkarg(3,"f");
 				dtmp = d2r(atof(av[++i]));
 				m4[0][0] = m4[2][2] = cos(dtmp);
 				m4[0][2] = -(m4[2][0] = sin(dtmp));
 				break;
 			case 'z':
-				checkarg(3,1);
+				checkarg(3,"f");
 				dtmp = d2r(atof(av[++i]));
 				m4[0][0] = m4[1][1] = cos(dtmp);
 				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
 		case 's':			/* scale */
-			checkarg(2,1);
+			checkarg(2,"f");
 			dtmp = atof(av[i+1]);
 			if (dtmp == 0.0) goto done;
 			i++;
@@ -87,27 +85,27 @@ char  *av[];
 		case 'm':			/* mirror */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[0][0] = -1.0;
 				break;
 			case 'y':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[1][1] = -1.0;
 				break;
 			case 'z':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[2][2] = -1.0;
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
 		case 'i':			/* iterate */
-			checkarg(2,1);
+			checkarg(2,"i");
 			while (icnt-- > 0) {
 				multmat4(ret->xfm, ret->xfm, xfmat);
 				ret->sca *= xfsca;
@@ -118,7 +116,7 @@ char  *av[];
 			continue;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, xfmat, m4);
@@ -138,8 +136,7 @@ register XF  *ret;
 int  ac;
 char  *av[];
 {
-	double  atof(), sin(), cos();
-	double  xfmat[4][4], m4[4][4];
+	MAT4  xfmat, m4;
 	double  xfsca, dtmp;
 	int  i, icnt;
 
@@ -157,7 +154,7 @@ char  *av[];
 		switch (av[i][1]) {
 	
 		case 't':			/* translate */
-			checkarg(2,3);
+			checkarg(2,"fff");
 			m4[3][0] = -atof(av[++i]);
 			m4[3][1] = -atof(av[++i]);
 			m4[3][2] = -atof(av[++i]);
@@ -166,30 +163,30 @@ char  *av[];
 		case 'r':			/* rotate */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,1);
+				checkarg(3,"f");
 				dtmp = -d2r(atof(av[++i]));
 				m4[1][1] = m4[2][2] = cos(dtmp);
 				m4[2][1] = -(m4[1][2] = sin(dtmp));
 				break;
 			case 'y':
-				checkarg(3,1);
+				checkarg(3,"f");
 				dtmp = -d2r(atof(av[++i]));
 				m4[0][0] = m4[2][2] = cos(dtmp);
 				m4[0][2] = -(m4[2][0] = sin(dtmp));
 				break;
 			case 'z':
-				checkarg(3,1);
+				checkarg(3,"f");
 				dtmp = -d2r(atof(av[++i]));
 				m4[0][0] = m4[1][1] = cos(dtmp);
 				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
 		case 's':			/* scale */
-			checkarg(2,1);
+			checkarg(2,"f");
 			dtmp = atof(av[i+1]);
 			if (dtmp == 0.0) goto done;
 			i++;
@@ -202,27 +199,27 @@ char  *av[];
 		case 'm':			/* mirror */
 			switch (av[i][2]) {
 			case 'x':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[0][0] = -1.0;
 				break;
 			case 'y':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[1][1] = -1.0;
 				break;
 			case 'z':
-				checkarg(3,0);
+				checkarg(3,"");
 				xfsca *=
 				m4[2][2] = -1.0;
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
 		case 'i':			/* iterate */
-			checkarg(2,1);
+			checkarg(2,"i");
 			while (icnt-- > 0) {
 				multmat4(ret->xfm, xfmat, ret->xfm);
 				ret->sca *= xfsca;
@@ -233,7 +230,7 @@ char  *av[];
 			break;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, m4, xfmat);	/* left multiply */