--- ray/src/cv/trans.c	1990/12/11 08:45:51	1.1
+++ ray/src/cv/trans.c	2003/06/08 12:03:09	2.4
@@ -1,9 +1,6 @@
-/* Copyright (c) 1990 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: trans.c,v 2.4 2003/06/08 12:03:09 schorsch Exp $";
 #endif
-
 /*
  * Translator utilities
  *
@@ -11,14 +8,21 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include "standard.h"
 #include "trans.h"
 
+static int idcmp(ID *id1, ID *id2);
+static void fputidlist(IDLIST *qp, FILE *fp);
+static int qtype(char *qnm, register QLIST *qlp);
 
-fgetid(idp, dls, fp)		/* read an id up to char in dls from fp */
-register ID	*idp;
-char	*dls;
-FILE	*fp;
+fgetid(		/* read an id up to char in dls from fp */
+ID	*idp,
+char	*dls,
+register FILE	*fp
+)
 {
 	char	dset[256/8];
 	char	buf[MAXSTR];
@@ -62,10 +66,11 @@ FILE	*fp;
 
 
 int
-findid(idl, idp, insert)		/* find (or insert) id in list */
-register IDLIST	*idl;
-ID	*idp;
-int	insert;
+findid(		/* find (or insert) id in list */
+register IDLIST	*idl,
+ID	*idp,
+int	insert
+)
 {
 	int  upper, lower;
 	register int  cm, i;
@@ -89,7 +94,7 @@ int	insert;
     		if (idl->id == NULL)
     			goto memerr;
     	} else {				/* grow old list */
-    		idl->id = (ID *)realloc((char *)idl->id,(idl->nids+1)*sizeof(ID));
+    		idl->id = (ID *)realloc((void *)idl->id,(idl->nids+1)*sizeof(ID));
     		if (idl->id == NULL)
     			goto memerr;
     		for (i = idl->nids; i > upper; i--) {
@@ -107,12 +112,15 @@ int	insert;
 memerr:
 	eputs("Out of memory in findid\n");
 	quit(1);
+	return -1; /* pro forma return */
 }
 
 
-int
-idcmp(id1, id2)				/* compare two identifiers */
-register ID	*id1, *id2;
+static int
+idcmp(				/* compare two identifiers */
+register ID	*id1,
+register ID *id2
+)
 {
 					/* names are greater than numbers */
 	if (id1->name == NULL)
@@ -128,10 +136,12 @@ register ID	*id1, *id2;
 }
 
 
-write_quals(qlp, idl, fp)	/* write out qualifier lists */
-QLIST	*qlp;
-IDLIST	idl[];
-FILE	*fp;
+void
+write_quals(	/* write out qualifier lists */
+QLIST	*qlp,
+IDLIST	idl[],
+FILE	*fp
+)
 {
 	int	i;
 	
@@ -144,9 +154,11 @@ FILE	*fp;
 }
 
 
-fputidlist(qp, fp)		/* put id list out to fp */
-IDLIST	*qp;
-FILE	*fp;
+static void
+fputidlist(		/* put id list out to fp */
+IDLIST	*qp,
+FILE	*fp
+)
 {
 	int	fi;
 	register int	i;
@@ -172,9 +184,10 @@ FILE	*fp;
 
 
 RULEHD *
-getmapping(file, qlp)		/* read in mapping file */
-char	*file;
-QLIST	*qlp;
+getmapping(		/* read in mapping file */
+char	*file,
+QLIST	*qlp
+)
 {
 	char	*err;
 	register int	c;
@@ -266,13 +279,15 @@ fmterr:
 memerr:
 	eputs("Out of memory in getmapping\n");
 	quit(1);
+	return NULL; /* pro forma return */
 }
 
 
-int
-qtype(qnm, qlp)			/* return number for qualifier name */
-char	*qnm;
-register QLIST	*qlp;
+static int
+qtype(			/* return number for qualifier name */
+char	*qnm,
+register QLIST	*qlp
+)
 {
 	register int	i;
 	
@@ -283,9 +298,11 @@ register QLIST	*qlp;
 }
 
 
-matchid(it, im)			/* see if we match an id */
-register ID	*it;
-register IDMATCH	*im;
+int
+matchid(			/* see if we match an id */
+register ID	*it,
+register IDMATCH	*im
+)
 {
 	if (it->name == NULL) {
 		if (im->nam != NULL)