diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2003-12-20 21:19:41 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2003-12-20 21:19:41 +0000 |
| commit | 68f014c3f647140e92107cb07f0b678ca2698286 (patch) | |
| tree | af735be844807df313e8791766eb86f0538b4296 /usr.sbin | |
| parent | 6d38bf1a80dd5babaa86f4722838f982e0310e9d (diff) | |
more cast cleanup imsg_compose takes now a void * argument. OK henning@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bgpd/bgpd.h | 4 | ||||
| -rw-r--r-- | usr.sbin/bgpd/imsg.c | 4 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index e3cfc242c69..1f0f55cb02c 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.5 2003/12/20 21:14:55 henning Exp $ */ +/* $OpenBSD: bgpd.h,v 1.6 2003/12/20 21:19:40 claudio Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -267,7 +267,7 @@ int merge_config(struct bgpd_config *, struct bgpd_config *); /* imsg.c */ void init_imsg_buf(void); int get_imsg(int, struct imsg *); -int imsg_compose(int, int, u_int32_t, u_char *, u_int16_t); +int imsg_compose(int, int, u_int32_t, void *, u_int16_t); void imsg_free(struct imsg *); /* rde.c */ diff --git a/usr.sbin/bgpd/imsg.c b/usr.sbin/bgpd/imsg.c index ecd6995719c..e2f72ca7576 100644 --- a/usr.sbin/bgpd/imsg.c +++ b/usr.sbin/bgpd/imsg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: imsg.c,v 1.4 2003/12/20 21:14:55 henning Exp $ */ +/* $OpenBSD: imsg.c,v 1.5 2003/12/20 21:19:40 claudio Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -84,7 +84,7 @@ get_imsg(int fd, struct imsg *imsg) } int -imsg_compose(int fd, int type, u_int32_t peerid, u_char *data, +imsg_compose(int fd, int type, u_int32_t peerid, void *data, u_int16_t datalen) { struct buf *wbuf; diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index 68b07fd7a7a..c7ec12e1c6b 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.13 2003/12/20 20:53:30 henning Exp $ */ +/* $OpenBSD: rde.c,v 1.14 2003/12/20 21:19:40 claudio Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -189,7 +189,7 @@ rde_dispatch_imsg(int fd, int idx) case IMSG_RECONF_PEER: if (idx != PFD_PIPE_MAIN) fatal("reconf request not from parent", 0); - pconf = (struct peer_config *)imsg.data; + pconf = imsg.data; p = peer_get(pconf->id); /* will always fail atm */ if (p == NULL) p = peer_add(pconf->id, pconf); @@ -505,7 +505,7 @@ rde_update_err(u_int32_t peerid, enum suberr_update errorcode) errcode = errorcode; se_queued_writes += imsg_compose(se_sock, IMSG_UPDATE_ERR, - peerid, (u_char *)&errcode, sizeof(errcode)); + peerid, &errcode, sizeof(errcode)); } |