--- ray/src/hd/rhoptimize.c	2003/10/20 16:01:55	3.16
+++ ray/src/hd/rhoptimize.c	2016/03/07 01:15:01	3.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhoptimize.c,v 3.16 2003/10/20 16:01:55 greg Exp $";
+static const char	RCSid[] = "$Id: rhoptimize.c,v 3.21 2016/03/07 01:15:01 schorsch Exp $";
 #endif
 /*
  * Optimize holodeck for quick access.
@@ -9,10 +9,13 @@ static const char	RCSid[] = "$Id: rhoptimize.c,v 3.16 
 
 #include <signal.h>
 #include <string.h>
+#include <stdio.h>
 
+#include "platform.h"
+#include "rterror.h"
+#include "resolu.h"
 #include "rtprocess.h" /* getpid() */
 #include "holo.h"
-#include "platform.h"
 
 #ifndef BKBSIZE
 #define BKBSIZE		256		/* beam clump size (kilobytes) */
@@ -22,16 +25,22 @@ char	*progname;
 char	tempfile[128];
 int	dupchecking = 0;
 
-extern long	rhinitcopy();
+static long rhinitcopy(int hfd[2], char *infn, char *outfn);
+static int nuniq(RAYVAL *rva, int n);
+static int bpcmp(const void *b1p, const void *b2p);
+static int xferclump(HOLO *hp, int *bq, int nb);
+static void copysect(int ifd, int ofd);
 
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+int
+main(
+	int	argc,
+	char	*argv[]
+)
 {
 	char	*inpname, *outname;
 	int	hdfd[2];
-	long	nextipos, lastopos, thisopos;
+	off_t	nextipos, lastopos, thisopos;
 
 	progname = argv[0];
 	argv++; argc--;			/* duplicate checking flag? */
@@ -63,20 +72,20 @@ char	*argv[];
 	}
 					/* copy holodeck file header */
 	nextipos = rhinitcopy(hdfd, inpname, outname);
-	lastopos = 0L;			/* copy sections one by one */
+	lastopos = 0;			/* copy sections one by one */
 	while (nextipos != 0L) {
 					/* set input position; get next */
-		lseek(hdfd[0], (off_t)nextipos, SEEK_SET);
+		lseek(hdfd[0], nextipos, SEEK_SET);
 		read(hdfd[0], (char *)&nextipos, sizeof(nextipos));
 					/* get output position; set last */
 		thisopos = lseek(hdfd[1], (off_t)0, SEEK_END);
-		if (lastopos > 0L) {
-			lseek(hdfd[1], (off_t)lastopos, SEEK_SET);
+		if (lastopos > 0) {
+			lseek(hdfd[1], lastopos, SEEK_SET);
 			write(hdfd[1], (char *)&thisopos, sizeof(thisopos));
 			lseek(hdfd[1], (off_t)0, SEEK_END);
 		}
 		lastopos = thisopos;
-		thisopos = 0L;		/* write place holder */
+		thisopos = 0;		/* write place holder */
 		write(hdfd[1], (char *)&thisopos, sizeof(thisopos));
 					/* copy holodeck section */
 		copysect(hdfd[0], hdfd[1]);
@@ -89,14 +98,16 @@ char	*argv[];
 				outname, inpname);
 		error(SYSTEM, errmsg);
 	}
-	exit(0);
+	return 0;
 }
 
 
-long
-rhinitcopy(hfd, infn, outfn)	/* open files and copy header */
-int	hfd[2];			/* returned file descriptors */
-char	*infn, *outfn;
+static long
+rhinitcopy(	/* open files and copy header */
+	int	hfd[2],			/* returned file descriptors */
+	char	*infn,
+	char	*outfn
+)
 {
 	FILE	*infp, *outfp;
 	long	ifpos;
@@ -114,9 +125,15 @@ char	*infn, *outfn;
 		error(SYSTEM, errmsg);
 	}
 					/* set up signal handling */
+#ifdef SIGINT
 	if (signal(SIGINT, quit) == SIG_IGN) signal(SIGINT, SIG_IGN);
+#endif
+#ifdef SIGHUP
 	if (signal(SIGHUP, quit) == SIG_IGN) signal(SIGHUP, SIG_IGN);
+#endif
+#ifdef SIGTERM
 	if (signal(SIGTERM, quit) == SIG_IGN) signal(SIGTERM, SIG_IGN);
+#endif
 #ifdef SIGXCPU
 	if (signal(SIGXCPU, quit) == SIG_IGN) signal(SIGXCPU, SIG_IGN);
 	if (signal(SIGXFSZ, quit) == SIG_IGN) signal(SIGXFSZ, SIG_IGN);
@@ -143,10 +160,11 @@ char	*infn, *outfn;
 }
 
 
-int
-nuniq(rva, n)			/* sort unique rays to front of beam list */
-register RAYVAL	*rva;
-int	n;
+static int
+nuniq(			/* sort unique rays to front of beam list */
+	register RAYVAL	*rva,
+	int	n
+)
 {
 	register int	i, j;
 	RAYVAL	rtmp;
@@ -171,10 +189,12 @@ int	n;
 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);
 	return(pdif > 0L);
@@ -183,9 +203,11 @@ int	*b1p, *b2p;
 static HOLO	*hout;
 
 static int
-xferclump(hp, bq, nb)		/* transfer the given clump to hout and free */
-HOLO	*hp;
-int	*bq, nb;
+xferclump(		/* transfer the given clump to hout and free */
+	HOLO	*hp,
+	int	*bq,
+	int	nb
+)
 {
 	register int	i;
 	register BEAM	*bp;
@@ -206,8 +228,11 @@ int	*bq, nb;
 	return(0);
 }
 
-copysect(ifd, ofd)		/* copy holodeck section from ifd to ofd */
-int	ifd, ofd;
+static void
+copysect(		/* copy holodeck section from ifd to ofd */
+	int	ifd,
+	int	ofd
+)
 {
 	HOLO	*hinp;
 					/* load input section directory */