--- ray/src/common/xf.c	1991/11/08 13:45:54	1.12
+++ ray/src/common/xf.c	2003/06/27 22:27:45	2.7
@@ -1,16 +1,15 @@
-/* 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.7 2003/06/27 22:27:45 greg Exp $";
 #endif
-
 /*
  *  xf.c - routines to convert transform arguments into 4X4 matrix.
  *
- *     1/28/86
+ *  External symbols declared in rtmath.h
  */
 
-#include  "standard.h"
+#include  <stdlib.h>
+#include  "rtmath.h"
+#include  "rtio.h"
 
 #define  d2r(a)		((PI/180.)*(a))
 
@@ -23,7 +22,6 @@ register XF  *ret;
 int  ac;
 char  *av[];
 {
-	double  atof(), sin(), cos();
 	MAT4  xfmat, m4;
 	double  xfsca, dtmp;
 	int  i, icnt;
@@ -69,7 +67,7 @@ char  *av[];
 				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -102,7 +100,7 @@ char  *av[];
 				m4[2][2] = -1.0;
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -118,7 +116,7 @@ char  *av[];
 			continue;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, xfmat, m4);
@@ -138,7 +136,6 @@ register XF  *ret;
 int  ac;
 char  *av[];
 {
-	double  atof(), sin(), cos();
 	MAT4  xfmat, m4;
 	double  xfsca, dtmp;
 	int  i, icnt;
@@ -184,7 +181,7 @@ char  *av[];
 				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -217,7 +214,7 @@ char  *av[];
 				m4[2][2] = -1.0;
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -233,7 +230,7 @@ char  *av[];
 			break;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, m4, xfmat);	/* left multiply */