--- ray/src/common/header.c	2003/07/12 15:14:44	2.18
+++ ray/src/common/header.c	2003/07/30 10:11:06	2.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: header.c,v 2.18 2003/07/12 15:14:44 greg Exp $";
+static const char	RCSid[] = "$Id: header.c,v 2.21 2003/07/30 10:11:06 schorsch Exp $";
 #endif
 /*
  *  header.c - routines for reading and writing information headers.
@@ -187,7 +187,7 @@ FILE  *fp;
 int
 getheader(fp, f, p)		/* get header from file */
 FILE  *fp;
-int  (*f)();
+int  (*f)(char *, char *);
 char  *p;
 {
 	char  buf[MAXLINE];
@@ -311,11 +311,12 @@ FILE  *fout;
 	if (!cdat.fs[0])
 		return(0);
 	for (cp = fmt; *cp; cp++)		/* check for globbing */
-		if (*cp == '?' | *cp == '*')
+		if ((*cp == '?') | (*cp == '*')) {
 			if (globmatch(fmt, cdat.fs)) {
 				strcpy(fmt, cdat.fs);
 				return(1);
 			} else
 				return(-1);
+		}
 	return(strcmp(fmt, cdat.fs) ? -1 : 1);	/* literal match */
 }