diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-31 10:39:54 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-31 10:39:54 -0700 |
| commit | 2f30d8d38448c7ecde96304e3a94dbb5667b8dcc (patch) | |
| tree | 99831498d4e7cc680592a54d3959894eba173067 /lib/stream.c | |
| parent | f9ca20da1a62324d1ee9c11dd13c71f8986f4909 (diff) | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| download | quagga-2f30d8d38448c7ecde96304e3a94dbb5667b8dcc.tar.bz2 quagga-2f30d8d38448c7ecde96304e3a94dbb5667b8dcc.tar.xz | |
Merge branch 'upstream' into islavista
Conflicts:
ChangeLog
NEWS
bgpd/ChangeLog
bgpd/bgp_attr.c
bgpd/bgp_network.c
bgpd/bgp_packet.c
bgpd/bgp_vty.c
bgpd/bgpd.c
bgpd/bgpd.h
lib/sockopt.c
lib/sockopt.h
lib/zebra.h
mkinstalldirs
zebra/rib.h
zebra/rt_netlink.c
Diffstat (limited to 'lib/stream.c')
| -rw-r--r-- | lib/stream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stream.c b/lib/stream.c index 7034d904..983330ff 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -458,7 +458,7 @@ stream_get_ipv4 (struct stream *s) * stream_write() is saner */ void -stream_put (struct stream *s, void *src, size_t size) +stream_put (struct stream *s, const void *src, size_t size) { /* XXX: CHECK_SIZE has strange semantics. It should be deprecated */ @@ -833,7 +833,7 @@ stream_recvmsg (struct stream *s, int fd, struct msghdr *msgh, int flags, /* Write data to buffer. */ size_t -stream_write (struct stream *s, u_char *ptr, size_t size) +stream_write (struct stream *s, const void *ptr, size_t size) { CHECK_SIZE(s, size); |