diff options
| author |   claudio <claudio@openbsd.org> | 2021-01-19 09:54:08 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2021-01-19 09:54:08 +0000 |
| commit | ccbb71f57490b287817b2ce4aab0678cc2049dd9 (patch) | |
| tree | 9cf995f65283a83fb7f111d7ba0656ab1fb2908a | |
| parent | Use ospfe_imsg_compose_rde() instead of exporting iev_rde and using (diff) | |
| download | wireguard-openbsd-ccbb71f57490b287817b2ce4aab0678cc2049dd9.tar.xz wireguard-openbsd-ccbb71f57490b287817b2ce4aab0678cc2049dd9.zip | |
Make the struct imsgev static. With this ospf6d compiles with -fno-common
| -rw-r--r-- | usr.sbin/ospf6d/ospf6d.c | 6 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/ospfe.c | 6 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/rde.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.sbin/ospf6d/ospf6d.c b/usr.sbin/ospf6d/ospf6d.c index 7b06bc54710..40732a43b53 100644 --- 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 ef5423501c6..4ba520480a7 100644 --- 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 bc62da0861e..f4a047206ec 100644 --- 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; |