--- ray/src/common/xf.c	1991/12/19 14:45:41	2.2
+++ ray/src/common/xf.c	2003/06/27 06:53:22	2.6
@@ -1,16 +1,14 @@
-/* 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.6 2003/06/27 06:53:22 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  "rtmath.h"
+#include  "rtio.h"
 
 #define  d2r(a)		((PI/180.)*(a))
 
@@ -68,7 +66,7 @@ char  *av[];
 				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -101,7 +99,7 @@ char  *av[];
 				m4[2][2] = -1.0;
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -117,7 +115,7 @@ char  *av[];
 			continue;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, xfmat, m4);
@@ -182,7 +180,7 @@ char  *av[];
 				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -215,7 +213,7 @@ char  *av[];
 				m4[2][2] = -1.0;
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -231,7 +229,7 @@ char  *av[];
 			break;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, m4, xfmat);	/* left multiply */