diff options
| author |   claudio <claudio@openbsd.org> | 2021-01-19 12:29:46 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2021-01-19 12:29:46 +0000 |
| commit | 38da627a66fb00dc6bdd3ca46fa825637772ecba (patch) | |
| tree | 9750971ff00bf7720593b7b6652ae8048b5ef556 | |
| parent | Remove some unused #defines and remove some commented-out variables. (diff) | |
| download | wireguard-openbsd-38da627a66fb00dc6bdd3ca46fa825637772ecba.tar.xz wireguard-openbsd-38da627a66fb00dc6bdd3ca46fa825637772ecba.zip | |
Make struct imsgev static like in the other routing daemons. With this
dvmrpd should compile with -fno-common
| -rw-r--r-- | usr.sbin/dvmrpd/dvmrpd.c | 6 | ||||
| -rw-r--r-- | usr.sbin/dvmrpd/dvmrpe.c | 6 | ||||
| -rw-r--r-- | usr.sbin/dvmrpd/rde.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/dvmrpd/dvmrpd.c b/usr.sbin/dvmrpd/dvmrpd.c index 782e63f136c..df7b9361557 100644 --- a/usr.sbin/dvmrpd/dvmrpd.c +++ b/usr.sbin/dvmrpd/dvmrpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvmrpd.c,v 1.26 2021/01/19 12:26:38 claudio Exp $ */ +/* $OpenBSD: dvmrpd.c,v 1.27 2021/01/19 12:29:46 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -62,8 +62,8 @@ int pipe_parent2rde[2]; int pipe_dvmrpe2rde[2]; struct dvmrpd_conf *conf = NULL; -struct imsgev *iev_dvmrpe; -struct imsgev *iev_rde; +static struct imsgev *iev_dvmrpe; +static struct imsgev *iev_rde; pid_t dvmrpe_pid; pid_t rde_pid; diff --git a/usr.sbin/dvmrpd/dvmrpe.c b/usr.sbin/dvmrpd/dvmrpe.c index 75432dbe591..c799e37e841 100644 --- a/usr.sbin/dvmrpd/dvmrpe.c +++ b/usr.sbin/dvmrpd/dvmrpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvmrpe.c,v 1.22 2021/01/19 12:26:38 claudio Exp $ */ +/* $OpenBSD: dvmrpe.c,v 1.23 2021/01/19 12:29:46 claudio Exp $ */ /* * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org> @@ -47,8 +47,8 @@ __dead void dvmrpe_shutdown(void); volatile sig_atomic_t dvmrpe_quit = 0; struct dvmrpd_conf *deconf = NULL; -struct imsgev *iev_main; -struct imsgev *iev_rde; +static struct imsgev *iev_main; +static struct imsgev *iev_rde; void dvmrpe_sig_handler(int sig, short event, void *bula) diff --git a/usr.sbin/dvmrpd/rde.c b/usr.sbin/dvmrpd/rde.c index 330b3f97866..8f79137a939 100644 --- a/usr.sbin/dvmrpd/rde.c +++ b/usr.sbin/dvmrpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.30 2021/01/19 12:26:38 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.31 2021/01/19 12:29:46 claudio Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -48,8 +48,8 @@ int rde_select_ds_ifs(struct mfc *, struct iface *); volatile sig_atomic_t rde_quit = 0; struct dvmrpd_conf *rdeconf = NULL; struct rde_nbr *nbrself; -struct imsgev *iev_dvmrpe; -struct imsgev *iev_main; +static struct imsgev *iev_dvmrpe; +static struct imsgev *iev_main; void rde_sig_handler(int sig, short event, void *arg) |