--- ray/src/common/calprnt.c	1991/07/15 12:59:41	1.1
+++ ray/src/common/calprnt.c	2003/02/25 02:47:21	2.3
@@ -1,20 +1,18 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: calprnt.c,v 2.3 2003/02/25 02:47:21 greg Exp $";
 #endif
-
 /*
  *  calprint.c - routines for printing calcomp expressions.
- *
- *     1/29/87
  */
 
+#include "copyright.h"
+
 #include  <stdio.h>
 
 #include  "calcomp.h"
 
 
+void
 eprint(ep, fp)			/* print a parse tree */
 register EPNODE  *ep;
 FILE  *fp;
@@ -34,14 +32,14 @@ FILE  *fp;
 
 	case FUNC:
 	    eprint(ep->v.kid, fp);
-	    fputs("(", fp);
+	    fputc('(', fp);
 	    ep1 = ep->v.kid->sibling;
 	    while (ep1 != NULL) {
 		eprint(ep1, fp);
 		if ((ep1 = ep1->sibling) != NULL)
 		    fputs(", ", fp);
 	    }
-	    fputs(")", fp);
+	    fputc(')', fp);
 	    break;
 
 	case ARG:
@@ -58,14 +56,8 @@ FILE  *fp;
 	    break;
 
 	case UMINUS:
-	    if (ep->v.kid->type == UMINUS) {
-		fputs("-(", fp);
-	        eprint(ep->v.kid, fp);
-		fputs(")", fp);
-	    } else {
-		fputs("-", fp);
-		eprint(ep->v.kid, fp);
-	    }
+	    fputc('-', fp);
+	    eprint(ep->v.kid, fp);
 	    break;
 
 	case CHAN:
@@ -77,9 +69,9 @@ FILE  *fp;
 	    ep1 = curdef;
 	    curdef = ep;
 	    eprint(ep->v.kid, fp);
-	    putc(' ', fp);
-	    putc(ep->type, fp);
-	    putc(' ', fp);
+	    fputc(' ', fp);
+	    fputc(ep->type, fp);
+	    fputc(' ', fp);
 	    eprint(ep->v.kid->sibling, fp);
 	    curdef = ep1;
 	    break;
@@ -89,13 +81,13 @@ FILE  *fp;
 	case '*':
 	case '/':
 	case '^':
-	    fputs("(", fp);
+	    fputc('(', fp);
 	    eprint(ep->v.kid, fp);
-	    putc(' ', fp);
-	    putc(ep->type, fp);
-	    putc(' ', fp);
+	    fputc(' ', fp);
+	    fputc(ep->type, fp);
+	    fputc(' ', fp);
 	    eprint(ep->v.kid->sibling, fp);
-	    fputs(")", fp);
+	    fputc(')', fp);
 	    break;
 
 	default:
@@ -107,6 +99,7 @@ FILE  *fp;
 }
 
 
+void
 dprint(name, fp)		/* print a definition (all if no name) */
 char  *name;
 FILE  *fp;