--- ray/src/common/cone.c	1992/11/19 21:32:48	2.4
+++ ray/src/common/cone.c	2003/06/07 12:50:20	2.7
@@ -1,15 +1,12 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: cone.c,v 2.7 2003/06/07 12:50:20 schorsch Exp $";
 #endif
-
 /*
  *  cone.c - routines for making cones
- *
- *     2/12/86
  */
 
+#include "copyright.h"
+
 #include  "standard.h"
 
 #include  "object.h"
@@ -146,9 +143,11 @@ argcerr:
 	objerror(o, USER, "bad # arguments");
 raderr:
 	objerror(o, USER, "illegal radii");
+	return NULL; /* pro forma return */
 }
 
 
+void
 freecone(o)			/* free memory associated with cone */
 OBJREC  *o;
 {
@@ -157,12 +156,13 @@ OBJREC  *o;
 	if (co == NULL)
 		return;
 	if (co->tm != NULL)
-		free((char *)co->tm);
-	free((char *)co);
+		free((void *)co->tm);
+	free((void *)co);
 	o->os = NULL;
 }
 
 
+void
 conexform(co)			/* get cone transformation matrix */
 register CONE  *co;
 {