Make the struct imsgev static. With this ospf6d compiles with -fno-common

diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c
index 7b06bc5..40732a4 100644 (file)
--- a/usr.sbin/ospf6d/ospf6d.c
+++ b/usr.sbin/ospf6d/ospf6d.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ospf6d.c,v 1.49 2021/01/19 09:46:51 claudio Exp $ */
+/*     $OpenBSD: ospf6d.c,v 1.50 2021/01/19 09:54:08 claudio Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -66,8 +66,8 @@ int   pipe_ospfe2rde[2];
 
 enum ospfd_process      ospfd_process;
 struct ospfd_conf      *ospfd_conf = NULL;
-struct imsgev          *iev_ospfe;
-struct imsgev          *iev_rde;
+static struct imsgev   *iev_ospfe;
+static struct imsgev   *iev_rde;
 char                   *conffile;
 
 pid_t                   ospfe_pid = 0;

diff --git a/usr.sbin/ospf6d/ospfe.c b/usr.sbin/ospf6d/ospfe.c
index ef54235..4ba5204 100644 (file)
--- a/usr.sbin/ospf6d/ospfe.c
+++ b/usr.sbin/ospf6d/ospfe.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ospfe.c,v 1.66 2021/01/19 09:48:34 claudio Exp $ */
+/*     $OpenBSD: ospfe.c,v 1.67 2021/01/19 09:54:08 claudio Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -48,8 +48,8 @@ void           orig_rtr_lsa_all(struct area *);
 struct iface   *find_vlink(struct abr_rtr *);
 
 struct ospfd_conf      *oeconf = NULL, *noeconf;
-struct imsgev          *iev_main;
-struct imsgev          *iev_rde;
+static struct imsgev   *iev_main;
+static struct imsgev   *iev_rde;
 int                     oe_nofib;
 
 /* ARGSUSED */

diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c
index bc62da0..f4a0472 100644 (file)
--- a/usr.sbin/ospf6d/rde.c
+++ b/usr.sbin/ospf6d/rde.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde.c,v 1.88 2020/05/16 15:54:12 denis Exp $ */
+/*     $OpenBSD: rde.c,v 1.89 2021/01/19 09:54:08 claudio Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org>
@@ -88,8 +88,8 @@ int            prefix_compare(struct prefix_node *, struct prefix_node *);
 void            prefix_tree_add(struct prefix_tree *, struct lsa_link *);
 
 struct ospfd_conf      *rdeconf = NULL, *nconf = NULL;
-struct imsgev          *iev_ospfe;
-struct imsgev          *iev_main;
+static struct imsgev   *iev_ospfe;
+static struct imsgev   *iev_main;
 struct rde_nbr         *nbrself;
 struct lsa_tree                 asext_tree;