--- ray/src/hd/rhdisp.c	2003/06/30 14:59:11	3.47
+++ ray/src/hd/rhdisp.c	2004/01/01 11:21:55	3.50
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: rhdisp.c,v 3.47 2003/06/30 14:59:11 schorsch Exp $";
+static const char	RCSid[] = "$Id: rhdisp.c,v 3.50 2004/01/01 11:21:55 schorsch Exp $";
 #endif
 /*
  * Holodeck display process.
@@ -8,6 +8,7 @@ static const char	RCSid[] = "$Id: rhdisp.c,v 3.47 2003
 #include <string.h>
 #include <ctype.h>
 
+#include "rterror.h"
 #include "rholo.h"
 #include "rhdisp.h"
 #include "rhdriver.h"
@@ -57,10 +58,20 @@ static long	nimmrays, naddrays;
 #define RDY_DEV		02
 #define RDY_SIN		04
 
+static int disp_wait(void);
+static void add_holo(HDGRID *hdg, char *gfn, char *pfn);
+static void disp_bundle(PACKHEAD *p);
+static void new_view(register VIEW *v);
+static void set_focus(char *args);
+static int usr_input(void);
+static void printview(void);
 
-main(argc, argv)
-int	argc;
-char	*argv[];
+
+int
+main(
+	int	argc,
+	char	*argv[]
+)
 {
 	int	rdy, inp, res = 0, pause = 0;
 
@@ -149,16 +160,16 @@ char	*argv[];
 #endif
 					/* all done */
 	quit(0);
+	return 0; /* pro forma return */
 }
 
 
-int
-disp_wait()			/* wait for more input */
+static int
+disp_wait(void)			/* wait for more input */
 {
 	fd_set	readset, errset;
 	int	flgs;
 	int	n;
-	register int	i;
 				/* see if we can avoid select call */
 	if (hdlist[0] == NULL)
 		return(RDY_SRV);	/* initialize first */
@@ -203,9 +214,12 @@ disp_wait()			/* wait for more input */
 }
 
 
-add_holo(hdg, gfn, pfn)		/* register a new holodeck section */
-HDGRID	*hdg;
-char	*gfn, *pfn;
+static void
+add_holo(		/* register a new holodeck section */
+	HDGRID	*hdg,
+	char	*gfn,
+	char	*pfn
+)
 {
 	VIEW	nv;
 	double	d;
@@ -225,7 +239,7 @@ char	*gfn, *pfn;
 	if (hd)
 		return;
 					/* set initial viewpoint */
-	copystruct(&nv, &odev.v);
+	nv = odev.v;
 	VSUM(nv.vp, hdlist[0]->orig, hdlist[0]->xv[0], 0.5);
 	VSUM(nv.vp, nv.vp, hdlist[0]->xv[1], 0.5);
 	VSUM(nv.vp, nv.vp, hdlist[0]->xv[2], 0.5);
@@ -241,15 +255,17 @@ char	*gfn, *pfn;
 }
 
 
-disp_bundle(p)			/* display a ray bundle */
-register PACKHEAD	*p;
+static void
+disp_bundle(			/* display a ray bundle */
+	register PACKHEAD	*p
+)
 {
 	GCOORD	gc[2];
 	FVECT	ro, rd, wp;
 	double	d;
 	register int	i;
 					/* get beam coordinates */
-	if (p->hd < 0 | p->hd >= HDMAX || hdlist[p->hd] == NULL)
+	if ((p->hd < 0) | (p->hd >= HDMAX) || hdlist[p->hd] == NULL)
 		error(INTERNAL, "bad holodeck number in disp_bundle");
 	if (!hdbcoord(gc, hdlist[p->hd], p->bi))
 		error(INTERNAL, "bad beam index in disp_bundle");
@@ -270,8 +286,10 @@ register PACKHEAD	*p;
 }
 
 
-new_view(v)			/* change view parameters */
-register VIEW	*v;
+static void
+new_view(			/* change view parameters */
+	register VIEW	*v
+)
 {
 	static VIEW	viewhist[VIEWHISTLEN];
 	static unsigned	nhist;
@@ -306,7 +324,7 @@ again:
 				error(COMMAND, "invalid starting view");
 				return;
 			}
-			copystruct(v, viewhist + ((nhist-1)%VIEWHISTLEN));
+			*v = *(viewhist + ((nhist-1)%VIEWHISTLEN));
 			goto again;	/* poss. overloading dev_section()? */
 		}
 		DCHECK(*slist < 0, WARNING, "no visible sections in new_view");
@@ -319,14 +337,16 @@ again:
 	imm_mode = beam_sync(odev.firstuse) > 0;
 				/* record new view */
 	if (v < viewhist || v >= viewhist+VIEWHISTLEN) {
-		copystruct(viewhist + (nhist%VIEWHISTLEN), v);
+		*(viewhist + (nhist%VIEWHISTLEN)) = *v;
 		nhist++;
 	}
 }
 
 
-set_focus(args)			/* set focus frame */
-char	*args;
+static void
+set_focus(			/* set focus frame */
+	char	*args
+)
 {
 	double	hcent, vcent, hsiz, vsiz;
 	VIEW	*dv, vwfocus;
@@ -349,7 +369,7 @@ char	*args;
 	beam_init(0);					/* add basic views */
 	for (i = 0; (dv = dev_auxview(i, res)) != NULL; i++)
 		beam_view(dv, res[0]>>4, res[1]>>4);
-	copystruct(&vwfocus, &odev.v);			/* add focus view */
+	vwfocus = odev.v;			/* add focus view */
 	switch (odev.v.type) {
 	case VT_PER:
 		vwfocus.horiz = 2.*180./PI*atan(
@@ -385,8 +405,8 @@ char	*args;
 }
 
 
-int
-usr_input()			/* get user input and process it */
+static int
+usr_input(void)			/* get user input and process it */
 {
 	VIEW	vparams;
 	char	cmd[256];
@@ -415,7 +435,7 @@ usr_input()			/* get user input and process it */
 	}
 	switch (i) {
 	case DC_SETVIEW:		/* set the view */
-		copystruct(&vparams, &odev.v);
+		vparams = odev.v;
 		if (!sscanview(&vparams, args))
 			error(COMMAND, "missing view options");
 		else
@@ -457,7 +477,8 @@ usr_input()			/* get user input and process it */
 }
 
 
-printview()			/* print our current view to server stdout */
+static void
+printview(void)			/* print our current view to server stdout */
 {
 	fputs(VIEWSTR, sstdout);
 	fprintview(&odev.v, sstdout);
@@ -466,13 +487,12 @@ printview()			/* print our current view to server stdo
 }
 
 
-int
-serv_result()			/* get next server result and process it */
+extern int
+serv_result(void)			/* get next server result and process it */
 {
 	static char	*buf = NULL;
 	static int	bufsiz = 0;
 	MSGHEAD	msg;
-	int	n;
 					/* read message header */
 	if (fread((char *)&msg, sizeof(MSGHEAD), 1, stdin) != 1)
 		goto readerr;
@@ -540,12 +560,16 @@ readerr:
 	if (feof(stdin))
 		error(SYSTEM, "server process died");
 	error(SYSTEM, "error reading from server process");
+	return -1;  
 }
 
 
-serv_request(type, nbytes, p)	/* send a request to the server process */
-int	type, nbytes;
-char	*p;
+extern void
+serv_request(	/* send a request to the server process */
+	int	type,
+	int	nbytes,
+	char	*p
+)
 {
 	MSGHEAD	msg;
 	int	m;
@@ -570,8 +594,9 @@ char	*p;
 
 
 void
-eputs(s)			/* put error message to stderr */
-register char  *s;
+eputs(			/* put error message to stderr */
+	register char  *s
+)
 {
 	static int  midline = 0;
 
@@ -590,8 +615,9 @@ register char  *s;
 
 
 void
-quit(code)			/* clean up and exit */
-int	code;
+quit(			/* clean up and exit */
+	int	code
+)
 {
 	if (code)
 		exit(code);