--- ray/src/meta/misc.c	2003/02/22 02:07:26	1.1
+++ ray/src/meta/misc.c	2003/11/15 02:13:37	1.4
@@ -1,64 +1,26 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: misc.c,v 1.1 2003/02/22 02:07:26 greg Exp $";
+static const char	RCSid[] = "$Id: misc.c,v 1.4 2003/11/15 02:13:37 schorsch Exp $";
 #endif
 /*
  *   Miscellaneous functions for meta-files
  */
 
 
+#include  "rtio.h"
 #include  "meta.h"
 
 
-
 char  coms[] = COML;
 
 char  errmsg[128];
 
 
 
-error(errtype, emsg)		/* report error */
-
-int  errtype;
-char  *emsg;
-
-{
-
- switch (errtype)  {
-
-    case WARNING:
-       wputs(progname);
-       wputs(": warning - ");
-       wputs(emsg);
-       wputs("\n");
-       break;
-
-    case USER:
-       eputs(progname);
-       eputs(": fatal - ");
-       eputs(emsg);
-       eputs("\n");
-       exit(1);
-       break;
-
-    case SYSTEM:
-       eputs(progname);
-       eputs(": system - ");
-       eputs(emsg);
-       eputs("\n");
-       exit(1);
-       break;
-    }
-
- }
-
-
-
-
 int
-comndx(c)		/* return index for command */
+comndx(		/* return index for command */
+	register int  c
+)
 
-register int  c;
-
 {
  register char  *cp;
 
@@ -78,10 +40,10 @@ register int  c;
 
 
 PRIMITIVE  *
-pop(pl)			/* pop top off plist */
+pop(			/* pop top off plist */
+	register PLIST  *pl
+)
 
-register PLIST  *pl;
-
 {
  register PRIMITIVE  *p;
 
@@ -96,12 +58,12 @@ register PLIST  *pl;
 
 
 
+void
+push(		/* push primitive onto plist */
+	register PRIMITIVE  *p,
+	register PLIST  *pl
+)
 
-push(p, pl)		/* push primitive onto plist */
-
-register PRIMITIVE  *p;
-register PLIST  *pl;
-
 {
 
  if ((p->pnext = pl->ptop) == NULL)
@@ -112,12 +74,11 @@ register PLIST  *pl;
 
 
 
-
-add(p, pl)		/* add primitive to plist */
-
-register PRIMITIVE  *p;
-register PLIST  *pl;
-
+void
+add(		/* add primitive to plist */
+	register PRIMITIVE  *p,
+	register PLIST  *pl
+)
 {
 
  if (pl->ptop == NULL)
@@ -131,11 +92,12 @@ register PLIST  *pl;
 
 
 
+void
+append(		/* append pl1 to the end of pl2 */
+	register PLIST  *pl1,
+	register PLIST  *pl2
+)
 
-append(pl1, pl2)		/* append pl1 to the end of pl2 */
-
-register PLIST  *pl1, *pl2;
-
 {
 
     if (pl1->ptop != NULL) {
@@ -150,11 +112,11 @@ register PLIST  *pl1, *pl2;
 
 
 
+void
+fargs(		/* free any arguments p has */
+register PRIMITIVE  *p
+)
 
-fargs(p)		/* free any arguments p has */
-
-register PRIMITIVE  *p;
-
 {
 
  if (p->args != NULL) {
@@ -167,12 +129,12 @@ register PRIMITIVE  *p;
 
 
 char *
-nextscan(start, format, result)		/* scan and advance through string */
+nextscan(		/* scan and advance through string */
+	register char  *start,
+	char  *format,
+	char  *result
+)
 
-register char  *start;
-char  *format;
-char  *result;
-
 {
 
     if (start == NULL) return(NULL);
@@ -187,11 +149,12 @@ char  *result;
 }
 
 
-
-mcopy(p1, p2, n)	/* copy p2 into p1 size n */
-
-register char  *p1, *p2;
-register int  n;
+void
+mcopy(	/* copy p2 into p1 size n */
+register char  *p1,
+register char  *p2,
+register int  n
+)
 
 {