Make struct imsgev static like in the other routing daemons. With this

dvmrpd should compile with -fno-common

diff --git a/usr.sbin/dvmrpd/dvmrpd.c b/usr.sbin/dvmrpd/dvmrpd.c
index 782e63f..df7b936 100644 (file)
--- 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 75432db..c799e37 100644 (file)
--- 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 330b3f9..8f79137 100644 (file)
--- 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)