This patch finally cleanup pfctl_table.c. No more global buffer,

and a couple of parsing functions moved to parse.y or pfctl_parser
where they belong.

I also took the opportunity to replace "void" functions with exit(1)
or err() inside by "int" functions, with the caller checking the
return value for errors (much cleaner and an old request from Theo)

ok dhartmei@ henning@

1 files changed, 4 insertions, 15 deletions

diff --git a/usr.sbin/authpf/authpf.c b/usr.sbin/authpf/authpf.c
index c5b28c87449..56183c9b7e5 100644
--- a/usr.sbin/authpf/authpf.c
+++ b/usr.sbin/authpf/authpf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: authpf.c,v 1.62 2003/06/28 20:37:29 deraadt Exp $	*/
+/*	$OpenBSD: authpf.c,v 1.63 2003/07/03 09:13:05 cedric Exp $	*/
 
 /*
  * Copyright (C) 1998 - 2002 Bob Beck (beck@openbsd.org).
@@ -846,23 +846,12 @@ pfctl_set_limit(struct pfctl *pf, const char *opt, unsigned int limit)
 	return (1);
 }
 
-void
-pfctl_append_addr(char *addr, int net, int neg)
-{
-	/* appropriate message will be printed by following function */
-}
-
-void
-pfctl_append_file(char *file)
-{
-	/* appropriate message will be printed by following function */
-}
-
-void
+int
 pfctl_define_table(char *name, int flags, int addrs, int noaction,
-    const char *anchor, const char *ruleset)
+    const char *anchor, const char *ruleset, struct pfr_buffer *ab)
 {
 	fprintf(stderr, "table definitions not yet supported in authpf\n");
+	return (1);
 }
 
 int