summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-12-21 23:28:40 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-12-21 23:28:40 +0000
commit8e0b585774b6f6f8a1adfd76e058c4b490311f6e (patch)
tree2a174067bd5ffb05383b2a6884ea5a2264713ec4 /usr.sbin
parent6e837807704bcfce6bf07cdce480d9ee5e67cc78 (diff)
rename get_imsg() to imsg_get(); that's more consistent
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpd/bgpd.c4
-rw-r--r--usr.sbin/bgpd/bgpd.h4
-rw-r--r--usr.sbin/bgpd/imsg.c4
-rw-r--r--usr.sbin/bgpd/rde.c4
-rw-r--r--usr.sbin/bgpd/session.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index 59a748425f0..e88f7f0e6a3 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.c,v 1.11 2003/12/21 23:26:37 henning Exp $ */
+/* $OpenBSD: bgpd.c,v 1.12 2003/12/21 23:28:39 henning Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -303,7 +303,7 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx, struct mrt_config *conf)
ssize_t len;
int n;
- if (get_imsg(ibuf, &imsg) > 0) {
+ if (imsg_get(ibuf, &imsg) > 0) {
switch (imsg.hdr.type) {
case IMSG_MRT_MSG:
case IMSG_MRT_END:
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index 212a0217694..808aa1a9f83 100644
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.h,v 1.10 2003/12/21 23:26:37 henning Exp $ */
+/* $OpenBSD: bgpd.h,v 1.11 2003/12/21 23:28:39 henning Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -273,7 +273,7 @@ int merge_config(struct bgpd_config *, struct bgpd_config *);
/* imsg.c */
void imsg_init(struct imsgbuf *, int);
-int get_imsg(struct imsgbuf *, struct imsg *);
+int imsg_get(struct imsgbuf *, struct imsg *);
int imsg_compose(struct imsgbuf *, int, u_int32_t, void *, u_int16_t);
void imsg_free(struct imsg *);
diff --git a/usr.sbin/bgpd/imsg.c b/usr.sbin/bgpd/imsg.c
index bdbf8498858..0424062d18c 100644
--- a/usr.sbin/bgpd/imsg.c
+++ b/usr.sbin/bgpd/imsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imsg.c,v 1.7 2003/12/21 23:26:37 henning Exp $ */
+/* $OpenBSD: imsg.c,v 1.8 2003/12/21 23:28:39 henning Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -45,7 +45,7 @@ imsg_init(struct imsgbuf *ibuf, int sock)
}
int
-get_imsg(struct imsgbuf *ibuf, struct imsg *imsg)
+imsg_get(struct imsgbuf *ibuf, struct imsg *imsg)
{
struct imsg_hdr *hdr;
ssize_t n, read_total = 0, datalen = 0;
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 7fd724881ef..1531043177c 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.c,v 1.17 2003/12/21 23:26:38 henning Exp $ */
+/* $OpenBSD: rde.c,v 1.18 2003/12/21 23:28:39 henning Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -172,7 +172,7 @@ rde_dispatch_imsg(struct imsgbuf *ibuf, int idx)
struct rde_peer *p, *np;
u_int32_t rid;
- if (get_imsg(ibuf, &imsg) > 0) {
+ if (imsg_get(ibuf, &imsg) > 0) {
switch (imsg.hdr.type) {
case IMSG_RECONF_CONF:
if (idx != PFD_PIPE_MAIN)
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index 04b5f259e47..6e2f068a7f3 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.26 2003/12/21 23:26:38 henning Exp $ */
+/* $OpenBSD: session.c,v 1.27 2003/12/21 23:28:39 henning Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -1204,7 +1204,7 @@ session_dispatch_imsg(struct imsgbuf *ibuf, int idx)
struct peer *p, *next;
enum reconf_action reconf;
- if (get_imsg(ibuf, &imsg) > 0) {
+ if (imsg_get(ibuf, &imsg) > 0) {
switch (imsg.hdr.type) {
case IMSG_RECONF_CONF:
if (idx != PFD_PIPE_MAIN)