diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-12-20 21:26:49 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-12-20 21:26:49 +0000 |
| commit | 06aca222ffa5c8bab2acd9b6e180f38aa7b3d01c (patch) | |
| tree | 6491592f01edb47139a208aa229857e3aca462b4 | |
| parent | 68f014c3f647140e92107cb07f0b678ca2698286 (diff) | |
more from the castathon; imsg_compose takes void * now so get rid of the casts
| -rw-r--r-- | usr.sbin/bgpd/bgpd.c | 10 | ||||
| -rw-r--r-- | usr.sbin/bgpd/session.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c index 46ac14d8109..c8dab2e354f 100644 --- a/usr.sbin/bgpd/bgpd.c +++ b/usr.sbin/bgpd/bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.c,v 1.7 2003/12/20 20:53:30 henning Exp $ */ +/* $OpenBSD: bgpd.c,v 1.8 2003/12/20 21:26:48 henning Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -289,14 +289,14 @@ reconfigure(char *conffile, int se_fd, int *se_waiting, int rde_fd, return (-1); } *se_waiting += imsg_compose(se_fd, IMSG_RECONF_CONF, 0, - (u_char *)conf, sizeof(struct bgpd_config)); + conf, sizeof(struct bgpd_config)); *rde_waiting += imsg_compose(rde_fd, IMSG_RECONF_CONF, 0, - (u_char *)conf, sizeof(struct bgpd_config)); + conf, sizeof(struct bgpd_config)); for (p = conf->peers; p != NULL; p = p->next) { *se_waiting += imsg_compose(se_fd, IMSG_RECONF_PEER, - p->conf.id, (u_char *)&p->conf, sizeof(struct peer_config)); + p->conf.id, &p->conf, sizeof(struct peer_config)); *rde_waiting += imsg_compose(rde_fd, IMSG_RECONF_PEER, - p->conf.id, (u_char *)&p->conf, sizeof(struct peer_config)); + p->conf.id, &p->conf, sizeof(struct peer_config)); } *se_waiting += imsg_compose(se_fd, IMSG_RECONF_DONE, 0, NULL, 0); *rde_waiting += imsg_compose(rde_fd, IMSG_RECONF_DONE, 0, NULL, 0); diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index 898a84d1345..a8ffedf7287 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.20 2003/12/20 21:16:04 henning Exp $ */ +/* $OpenBSD: session.c,v 1.21 2003/12/20 21:26:48 henning Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -1324,6 +1324,6 @@ void session_up(struct peer *peer) { s2r_queued_writes += imsg_compose(s2r_sock, IMSG_SESSION_UP, - peer->conf.id, (u_char *)&peer->remote_bgpid, + peer->conf.id, &peer->remote_bgpid, sizeof(peer->remote_bgpid)); } |