summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhenning <henning@openbsd.org>2002-07-31 20:19:14 +0000
committerhenning <henning@openbsd.org>2002-07-31 20:19:14 +0000
commitd4151784ed570239816304baae2eba97500ae0ed (patch)
tree591a3b0adacf092975a587cd5e5a8705e76d950a
parentuse fork, not vfork. seems to fix misterious trapframe trashing on hppa; deraadt@ ok (diff)
downloadwireguard-openbsd-d4151784ed570239816304baae2eba97500ae0ed.tar.xz
wireguard-openbsd-d4151784ed570239816304baae2eba97500ae0ed.zip
KNF, esp. missing prototypes
-rw-r--r--sbin/pfctl/parse.y23
-rw-r--r--sbin/pfctl/pf_print_state.c4
2 files changed, 19 insertions, 8 deletions
diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 571abd9f181..051d52a4715 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.136 2002/07/30 14:53:48 henning Exp $ */
+/* $OpenBSD: parse.y,v 1.137 2002/07/31 20:19:14 henning Exp $ */
/*
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -131,6 +131,7 @@ struct peer {
struct node_port *port;
};
+int yyerror(char *, ...);
int rule_consistent(struct pf_rule *);
int nat_consistent(struct pf_nat *);
int rdr_consistent(struct pf_rdr *);
@@ -152,6 +153,15 @@ void expand_rule(struct pf_rule *, struct node_if *, struct node_proto *,
struct node_port *, struct node_uid *, struct node_gid *,
struct node_icmp *);
int check_rulestate(int);
+int kw_cmp(const void *, const void *);
+int lookup(char *);
+int lgetc(FILE *);
+int lungetc(int, FILE *);
+int findeol(void);
+int yylex(void);
+struct node_host *host(char *);
+int atoul(char *, u_long *);
+
struct sym {
struct sym *next;
@@ -163,10 +173,10 @@ struct sym *symhead = NULL;
int symset(const char *, const char *);
char * symget(const char *);
-void ifa_load();
+void ifa_load(void);
int ifa_exists(char *);
-struct node_host *ifa_lookup(char *);
-struct node_host *ifa_pick_ip(struct node_host *, u_int8_t);
+struct node_host *ifa_lookup(char *);
+struct node_host *ifa_pick_ip(struct node_host *, u_int8_t);
typedef struct {
union {
@@ -2098,8 +2108,7 @@ check_rulestate(int desired_state)
}
int
-kw_cmp(k, e)
- const void *k, *e;
+kw_cmp(const void *k, const void *e)
{
return (strcmp(k, ((struct keywords *)e)->k_name));
}
@@ -2236,7 +2245,7 @@ lungetc(int c, FILE *fin)
}
int
-findeol()
+findeol(void)
{
int c;
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c
index c6da620b4df..e7ad0c2ca17 100644
--- a/sbin/pfctl/pf_print_state.c
+++ b/sbin/pfctl/pf_print_state.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_print_state.c,v 1.4 2002/07/19 12:31:59 dhartmei Exp $ */
+/* $OpenBSD: pf_print_state.c,v 1.5 2002/07/31 20:19:15 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -55,6 +55,8 @@
#include "pfctl_parser.h"
#include "pf_print_state.h"
+void print_name(struct pf_addr *, struct pf_addr *, int);
+
int
unmask(struct pf_addr *m, u_int8_t af)
{