Acked-by: Donald Sharp <[email protected]> On Tue, Jun 14, 2016 at 10:06 AM, Paul Jakma <[email protected]> wrote:
> --- > zebra/rt_netlink.c | 7 ++++--- > zebra/rt_netlink.h | 4 ++-- > zebra/zebra_fpm_netlink.c | 2 +- > 3 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c > index e4505de..42cb9d4 100644 > --- a/zebra/rt_netlink.c > +++ b/zebra/rt_netlink.c > @@ -1328,7 +1328,7 @@ netlink_route_read (struct zebra_vrf *zvrf) > /* Utility function comes from iproute2. > Authors: Alexey Kuznetsov, <[email protected]> */ > int > -addattr_l (struct nlmsghdr *n, size_t maxlen, int type, void *data, int > alen) > +addattr_l (struct nlmsghdr *n, size_t maxlen, int type, void *data, > size_t alen) > { > size_t len; > struct rtattr *rta; > @@ -1348,9 +1348,10 @@ addattr_l (struct nlmsghdr *n, size_t maxlen, int > type, void *data, int alen) > } > > int > -rta_addattr_l (struct rtattr *rta, int maxlen, int type, void *data, int > alen) > +rta_addattr_l (struct rtattr *rta, size_t maxlen, int type, void *data, > + size_t alen) > { > - int len; > + size_t len; > struct rtattr *subrta; > > len = RTA_LENGTH (alen); > diff --git a/zebra/rt_netlink.h b/zebra/rt_netlink.h > index 63fbbe7..9fc7001 100644 > --- a/zebra/rt_netlink.h > +++ b/zebra/rt_netlink.h > @@ -30,10 +30,10 @@ > extern int > addattr32 (struct nlmsghdr *n, size_t maxlen, int type, int data); > extern int > -addattr_l (struct nlmsghdr *n, size_t maxlen, int type, void *data, int > alen); > +addattr_l (struct nlmsghdr *n, size_t maxlen, int type, void *data, > size_t alen); > > extern int > -rta_addattr_l (struct rtattr *rta, int maxlen, int type, void *data, int > alen); > +rta_addattr_l (struct rtattr *rta, size_t maxlen, int type, void *data, > size_t alen); > > extern const char * > nl_msg_type_to_str (uint16_t msg_type); > diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c > index 0173000..96e897b 100644 > --- a/zebra/zebra_fpm_netlink.c > +++ b/zebra/zebra_fpm_netlink.c > @@ -322,7 +322,7 @@ static int > netlink_route_info_encode (netlink_route_info_t *ri, char *in_buf, > size_t in_buf_len) > { > - int bytelen; > + size_t bytelen; > int nexthop_num = 0; > size_t buf_offset; > netlink_nh_info_t *nhi; > -- > 2.5.5 > > > _______________________________________________ > Quagga-dev mailing list > [email protected] > https://lists.quagga.net/mailman/listinfo/quagga-dev >
_______________________________________________ Quagga-dev mailing list [email protected] https://lists.quagga.net/mailman/listinfo/quagga-dev
