lib,bgpd: remove deprecated stream lib macros

A couple of deprecated lib/stream macros have aged out; remove
them, and replace the one remaining use.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2018-11-29 11:13:15 -05:00
parent 6c241117f8
commit 26c08e954d
2 changed files with 1 additions and 8 deletions

View File

@ -295,7 +295,7 @@ static uint16_t bgp_write(struct peer *peer)
int writenum;
do {
writenum = stream_get_endp(s) - stream_get_getp(s);
num = write(peer->fd, STREAM_PNT(s), writenum);
num = write(peer->fd, stream_pnt(s), writenum);
if (num < 0) {
if (!ERRNO_IO_RETRY(errno)) {

View File

@ -133,13 +133,6 @@ struct stream_fifo {
#define STREAM_CONCAT_REMAIN(S1, S2, size) ((size) - (S1)->endp - (S2)->endp)
/* deprecated macros - do not use in new code */
#if CONFDATE > 20181128
CPP_NOTICE("lib: time to remove deprecated stream.h macros")
#endif
#define STREAM_PNT(S) stream_pnt((S))
#define STREAM_REMAIN(S) STREAM_WRITEABLE((S))
/* this macro is deprecated, but not slated for removal anytime soon */
#define STREAM_DATA(S) ((S)->data)