--- ray/src/common/xf.c	1991/11/08 13:45:54	1.12
+++ ray/src/common/xf.c	1991/12/24 17:42:48	2.3
@@ -1,4 +1,4 @@
-/* Copyright (c) 1990 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -23,7 +23,6 @@ register XF  *ret;
 int  ac;
 char  *av[];
 {
-	double  atof(), sin(), cos();
 	MAT4  xfmat, m4;
 	double  xfsca, dtmp;
 	int  i, icnt;
@@ -69,7 +68,7 @@ char  *av[];
 				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -102,7 +101,7 @@ char  *av[];
 				m4[2][2] = -1.0;
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -118,7 +117,7 @@ char  *av[];
 			continue;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, xfmat, m4);
@@ -138,7 +137,6 @@ register XF  *ret;
 int  ac;
 char  *av[];
 {
-	double  atof(), sin(), cos();
 	MAT4  xfmat, m4;
 	double  xfsca, dtmp;
 	int  i, icnt;
@@ -184,7 +182,7 @@ char  *av[];
 				m4[1][0] = -(m4[0][1] = sin(dtmp));
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -217,7 +215,7 @@ char  *av[];
 				m4[2][2] = -1.0;
 				break;
 			default:
-				return(i);
+				goto done;
 			}
 			break;
 
@@ -233,7 +231,7 @@ char  *av[];
 			break;
 
 		default:
-			return(i);
+			goto done;
 
 		}
 		multmat4(xfmat, m4, xfmat);	/* left multiply */