--- ray/src/hd/rhcopy.c	2003/07/27 22:12:02	3.19
+++ ray/src/hd/rhcopy.c	2004/01/02 11:42:01	3.23
@@ -1,10 +1,12 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhcopy.c,v 3.19 2003/07/27 22:12:02 schorsch Exp $";
+static const char	RCSid[] = "$Id: rhcopy.c,v 3.23 2004/01/02 11:42:01 schorsch Exp $";
 #endif
 /*
  * Copy data into a holodeck file
  */
 
+#include "platform.h"
+#include "rterror.h"
 #include "holo.h"
 #include "view.h"
 
@@ -20,10 +22,29 @@ char	obstr, unobstr;		/* flag pointer values */
 
 char	*progname;		/* global argv[0] */
 
+struct phead {
+	VIEW	vw;
+	double	expos;
+	short	gotview;
+	short	badfmt;
+	short	altprims;
+};
+static int openholo(char *fname, int append);
+static void addray(FVECT ro, FVECT rd, double d, COLR cv);
+static gethfunc holheadline;
+static int bpcmp(const void *b1p, const void *b2p);
+static int addclump(HOLO *hp, int *bq, int nb);
+static void addholo(char *hdf);
+static gethfunc picheadline;
+static void addpicz(char *pcf, char *zbf);
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+
+
+int
+main(
+	int	argc,
+	char	*argv[]
+)
 {
 	int	i;
 
@@ -74,12 +95,14 @@ userr:
 #define H_OBST	02
 #define H_OBSF	04
 
-int
-holheadline(s, hf)		/* check holodeck header line */
-register char	*s;
-int	*hf;
+static int
+holheadline(		/* check holodeck header line */
+	register char	*s,
+	void	*vhf
+)
 {
 	char	fmt[32];
+	int	*hf = vhf;
 
 	if (formatval(fmt, s)) {
 		if (strcmp(fmt, HOLOFMT))
@@ -103,9 +126,10 @@ int	*hf;
 }
 
 int
-openholo(fname, append)		/* open existing holodeck file for i/o */
-char	*fname;
-int	append;
+openholo(		/* open existing holodeck file for i/o */
+	char	*fname,
+	int	append
+)
 {
 	FILE	*fp;
 	int	fd;
@@ -119,7 +143,7 @@ int	append;
 		error(SYSTEM, errmsg);
 	}
 					/* check header and magic number */
-	if (getheader(fp, holheadline, (char *)&hflags) < 0 ||
+	if (getheader(fp, holheadline, &hflags) < 0 ||
 			hflags&H_BADF || getw(fp) != HOLOMAGIC) {
 		sprintf(errmsg, "file \"%s\" not in holodeck format", fname);
 		error(USER, errmsg);
@@ -128,7 +152,7 @@ int	append;
 	nextloc = ftell(fp);			/* get stdio position */
 	fclose(fp);				/* done with stdio */
 	for (n = 0; nextloc > 0L; n++) {	/* initialize each section */
-		lseek(fd, (off_t)nextloc, 0);
+		lseek(fd, (off_t)nextloc, SEEK_SET);
 		read(fd, (char *)&nextloc, sizeof(nextloc));
 		hdinit(fd, NULL)->priv = hflags&H_OBST ? &obstr :
 				hflags&H_OBSF ? &unobstr : (char *)NULL;
@@ -141,10 +165,13 @@ int	append;
 #undef H_OBSF
 
 
-addray(ro, rd, d, cv)		/* add a ray to our output holodeck */
-FVECT	ro, rd;
-double	d;
-COLR	cv;
+void
+addray(		/* add a ray to our output holodeck */
+	FVECT	ro,
+	FVECT	rd,
+	double	d,
+	COLR	cv
+)
 {
 	int	sn, bi, n;
 	register HOLO	*hp;
@@ -191,10 +218,12 @@ COLR	cv;
 static BEAMI	*beamdir;
 
 static int
-bpcmp(b1p, b2p)			/* compare beam positions on disk */
-int	*b1p, *b2p;
+bpcmp(			/* compare beam positions on disk */
+	const void	*b1p,
+	const void	*b2p
+)
 {
-	register off_t	pdif = beamdir[*b1p].fo - beamdir[*b2p].fo;
+	register off_t	pdif = beamdir[*(int*)b1p].fo - beamdir[*(int*)b2p].fo;
 
 	if (pdif > 0L) return(1);
 	if (pdif < 0L) return(-1);
@@ -202,9 +231,11 @@ int	*b1p, *b2p;
 }
 
 static int
-addclump(hp, bq, nb)		/* transfer the given clump and free */
-HOLO	*hp;
-int	*bq, nb;
+addclump(		/* transfer the given clump and free */
+	HOLO	*hp,
+	int	*bq,
+	int	nb
+)
 {
 	GCOORD	gc[2];
 	FVECT	ro, rd;
@@ -234,8 +265,11 @@ int	*bq, nb;
 	return(0);
 }
 
-addholo(hdf)			/* add a holodeck file */
-char	*hdf;
+
+void
+addholo(			/* add a holodeck file */
+	char	*hdf
+)
 {
 	int	fd;
 					/* open the holodeck for reading */
@@ -251,21 +285,15 @@ char	*hdf;
 }
 
 
-struct phead {
-	VIEW	vw;
-	double	expos;
-	short	gotview;
-	short	badfmt;
-	short	altprims;
-};
 
-
-int
-picheadline(s, ph)		/* process picture header line */
-char	*s;
-struct phead	*ph;
+static int
+picheadline(		/* process picture header line */
+	char	*s,
+	void	*vph
+)
 {
 	char	fmt[32];
+	struct phead *ph = vph;
 
 	if (formatval(fmt, s)) {
 		ph->badfmt = strcmp(fmt, COLRFMT);
@@ -287,8 +315,11 @@ struct phead	*ph;
 }
 
 
-addpicz(pcf, zbf)		/* add a picture + depth-buffer */
-char	*pcf, *zbf;
+void
+addpicz(		/* add a picture + depth-buffer */
+	char	*pcf,
+	char	*zbf
+)
 {
 	FILE	*pfp;
 	int	zfd;
@@ -317,7 +348,7 @@ char	*pcf, *zbf;
 	phd.vw = stdview;
 	phd.expos = 1.0;
 	phd.badfmt = phd.gotview = phd.altprims = 0;
-	if (getheader(pfp, picheadline, (char *)&phd) < 0 ||
+	if (getheader(pfp, picheadline, &phd) < 0 ||
 			phd.badfmt || !fgetsresolu(&prs, pfp)) {
 		sprintf(errmsg, "bad format for picture file \"%s\"", pcf);
 		error(USER, errmsg);
@@ -393,8 +424,9 @@ char	*pcf, *zbf;
 
 
 void
-eputs(s)			/* put error message to stderr */
-register char  *s;
+eputs(			/* put error message to stderr */
+	register char  *s
+)
 {
 	static int  midline = 0;
 
@@ -413,8 +445,9 @@ register char  *s;
 
 
 void
-quit(code)			/* exit the program gracefully */
-int	code;
+quit(			/* exit the program gracefully */
+	int	code
+)
 {
 	hdsync(NULL, 1);	/* write out any buffered data */
 	exit(code);