--- ray/src/cv/mgf2meta.c	1995/05/04 14:25:15	2.5
+++ ray/src/cv/mgf2meta.c	2003/11/15 17:54:06	2.9
@@ -1,27 +1,24 @@
-/* Copyright (c) 1995 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: mgf2meta.c,v 2.9 2003/11/15 17:54:06 schorsch Exp $";
 #endif
-
 /*
  * Convert MGF (Materials and Geometry Format) to Metafile 2-d graphics
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <math.h>
+
+#include "meta.h"
 #include "random.h"
 #include "mgflib/parser.h"
+#include "plocate.h" /* XXX shouldn't this rather be in rtmath.h? */
 
 #define MSIZE	((1<<14)-1)
 #define	MX(v)	(int)(MSIZE*(v)[(proj_axis+1)%3])
 #define	MY(v)	(int)(MSIZE*(v)[(proj_axis+2)%3])
 
-#ifdef  DCL_ATOF
-extern double  atof();
-#endif
-
-int	r_face();
 int	proj_axis;
 double	limit[3][2];
 int	layer;
@@ -29,10 +26,16 @@ long	rthresh = 1;
 
 extern int	mg_nqcdivs;
 
+static int r_face(int ac, char **av);
+static void newlayer(void);
+static int doline(int v1x, int v1y, int v2x, int v2y);
 
-main(argc, argv)		/* convert files to stdout */
-int	argc;
-char	*argv[];
+
+int
+main(		/* convert files to stdout */
+	int	argc,
+	char	*argv[]
+)
 {
 	int	i;
 				/* initialize dispatch table */
@@ -75,9 +78,10 @@ userr:
 
 
 int
-r_face(ac, av)			/* convert a face */
-int	ac;
-char	**av;
+r_face(			/* convert a face */
+	int	ac,
+	char	**av
+)
 {
 	static FVECT	bbmin = {0,0,0}, bbmax = {1,1,1};
 	register int	i, j;
@@ -115,13 +119,10 @@ short	hshtab[HTBLSIZ][4];		/* done line segments */
 					(long)(mx2)<<5 ^ (long)(my2))
 
 
-newlayer()				/* start a new layer */
+void
+newlayer(void)				/* start a new layer */
 {
-#ifdef BSD
-	bzero((char *)hshtab, sizeof(hshtab));
-#else
-	(void)memset((char *)hshtab, 0, sizeof(hshtab));
-#endif
+	(void)memset((char *)hshtab, '\0', sizeof(hshtab));
 	if (++layer >= 16) {
 		mendpage();
 		layer = 0;
@@ -130,8 +131,12 @@ newlayer()				/* start a new layer */
 
 
 int
-doline(v1x, v1y, v2x, v2y)		/* draw line conditionally */
-int	v1x, v1y, v2x, v2y;
+doline(		/* draw line conditionally */
+	int	v1x,
+	int v1y,
+	int v2x,
+	int v2y
+)
 {
 	register int	h;