===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/find/operator.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/usr.bin/find/operator.c	2003/06/03 02:56:08	1.7
+++ src/usr.bin/find/operator.c	2003/06/26 07:27:29	1.8
@@ -1,4 +1,4 @@
-/*	$OpenBSD: operator.c,v 1.7 2003/06/03 02:56:08 millert Exp $	*/
+/*	$OpenBSD: operator.c,v 1.8 2003/06/26 07:27:29 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)operator.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: operator.c,v 1.7 2003/06/03 02:56:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: operator.c,v 1.8 2003/06/26 07:27:29 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -45,14 +45,14 @@
 #include <stdio.h>
 
 #include "find.h"
+#include "extern.h"
     
 /*
  * yanknode --
  *	destructively removes the top from the plan
  */
 static PLAN *
-yanknode(planp)    
-	PLAN **planp;		/* pointer to top of plan (modified) */
+yanknode(PLAN **planp)		/* pointer to top of plan (modified) */
 {
 	PLAN *node;		/* top node removed from the plan */
     
@@ -70,14 +70,13 @@
  *	simple node or a N_EXPR node containing a list of simple nodes.
  */
 static PLAN *
-yankexpr(planp)    
-	PLAN **planp;		/* pointer to top of plan (modified) */
+yankexpr(PLAN **planp)		/* pointer to top of plan (modified) */
 {
 	PLAN *next;	/* temp node holding subexpression results */
 	PLAN *node;		/* pointer to returned node or expression */
 	PLAN *tail;		/* pointer to tail of subplan */
 	PLAN *subplan;		/* pointer to head of ( ) expression */
-	int f_expr();
+	extern int f_expr(PLAN *, FTSENT *);
     
 	/* first pull the top node from the plan */
 	if ((node = yanknode(planp)) == NULL)
@@ -125,8 +124,7 @@
  *	replaces "parentheisized" plans in our search plan with "expr" nodes.
  */
 PLAN *
-paren_squish(plan)
-	PLAN *plan;		/* plan with ( ) nodes */
+paren_squish(PLAN *plan)		/* plan with ( ) nodes */
 {
 	PLAN *expr;	/* pointer to next expression */
 	PLAN *tail;	/* pointer to tail of result plan */
@@ -163,8 +161,7 @@
  *	compresses "!" expressions in our search plan.
  */
 PLAN *
-not_squish(plan)
-	PLAN *plan;		/* plan to process */
+not_squish(PLAN *plan)		/* plan to process */
 {
 	PLAN *next;	/* next node being processed */
 	PLAN *node;	/* temporary node used in N_NOT processing */
@@ -223,8 +220,7 @@
  *	compresses -o expressions in our search plan.
  */
 PLAN *
-or_squish(plan)
-	PLAN *plan;		/* plan with ors to be squished */
+or_squish(PLAN *plan)		/* plan with ors to be squished */
 {
 	PLAN *next;	/* next node being processed */
 	PLAN *tail;	/* pointer to tail of result plan */