summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2017-07-23 13:53:55 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2017-07-23 13:53:55 +0000
commite0912176cbfb3584e1ee9c27f720d8918d22a935 (patch)
treece4188581d00a6b396c182a9f7eded2ae53f8d72
parent9e923a08f464c558a9d9404a71304e68fd9a42c9 (diff)
Don't bother initializing global variables to 0, since they will be in BSS.
ok jca
-rw-r--r--usr.sbin/ifstated/ifstated.c8
-rw-r--r--usr.sbin/ifstated/parse.y6
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/ifstated/ifstated.c b/usr.sbin/ifstated/ifstated.c
index 52df1cb3745..7b8e0eea51e 100644
--- a/usr.sbin/ifstated/ifstated.c
+++ b/usr.sbin/ifstated/ifstated.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ifstated.c,v 1.54 2017/07/23 13:49:18 deraadt Exp $ */
+/* $OpenBSD: ifstated.c,v 1.55 2017/07/23 13:53:54 deraadt Exp $ */
/*
* Copyright (c) 2004 Marco Pfatschbacher <mpf@openbsd.org>
@@ -45,10 +45,10 @@
#include "ifstated.h"
#include "log.h"
-struct ifsd_config *conf = NULL, *newconf = NULL;
+struct ifsd_config *conf, *newconf;
-int opts = 0;
-int opt_inhibit = 0;
+int opts;
+int opt_inhibit;
char *configfile = "/etc/ifstated.conf";
struct event rt_msg_ev, sighup_ev, startup_ev, sigchld_ev;
diff --git a/usr.sbin/ifstated/parse.y b/usr.sbin/ifstated/parse.y
index 01191a49eae..62ee4e2dfbc 100644
--- a/usr.sbin/ifstated/parse.y
+++ b/usr.sbin/ifstated/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.44 2017/07/04 21:13:03 benno Exp $ */
+/* $OpenBSD: parse.y,v 1.45 2017/07/23 13:53:54 deraadt Exp $ */
/*
* Copyright (c) 2004 Ryan McBride <mcbride@openbsd.org>
@@ -80,7 +80,7 @@ static struct ifsd_config *conf;
char *start_state;
struct ifsd_action *curaction;
-struct ifsd_state *curstate = NULL;
+struct ifsd_state *curstate;
void link_states(struct ifsd_action *);
void set_expression_depth(struct ifsd_expression *, int);
@@ -419,7 +419,7 @@ lookup(char *s)
u_char *parsebuf;
int parseindex;
u_char pushback_buffer[MAXPUSHBACK];
-int pushback_index = 0;
+int pushback_index;
int
lgetc(int quotec)