diff options
| author | Renato Westphal <renatowestphal@gmail.com> | 2016-08-26 20:46:24 -0300 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-08-26 20:07:18 -0400 |
| commit | ea8b7c71a7d5fd7f49cd4ffe60b065dd2058b45d (patch) | |
| tree | d74138f39e9acaf14bb78a76a94309aa1ecc1423 | |
| parent | 4e851f1fa711946a7c8cea17ef41df76336881a9 (diff) | |
build/solaris: fix one error and a few warnings
Signed-off-by: Renato Westphal <renato@openbsd.org>
| -rw-r--r-- | bgpd/bgp_mplsvpn.c | 4 | ||||
| -rw-r--r-- | bgpd/bgp_network.c | 2 | ||||
| -rw-r--r-- | lib/bfd.c | 4 | ||||
| -rw-r--r-- | pimd/pim_cmd.c | 8 | ||||
| -rw-r--r-- | zebra/rtread_getmsg.c | 2 |
5 files changed, 11 insertions, 9 deletions
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c index 4650495faf..c22dbb05a9 100644 --- a/bgpd/bgp_mplsvpn.c +++ b/bgpd/bgp_mplsvpn.c @@ -482,7 +482,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd, u { u_int16_t type; struct rd_as rd_as; - struct rd_ip rd_ip = { 0, { 0 }, 0}; + struct rd_ip rd_ip = {0}; u_char *pnt; pnt = rn->p.u.val; @@ -672,7 +672,7 @@ bgp_show_mpls_vpn (struct vty *vty, struct prefix_rd *prd, enum bgp_show_type ty { u_int16_t type; struct rd_as rd_as; - struct rd_ip rd_ip = { 0, { 0 }, 0}; + struct rd_ip rd_ip = {0}; u_char *pnt; pnt = rn->p.u.val; diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index ed1c5600ee..58761a11d0 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -63,7 +63,9 @@ bgp_md5_set_socket (int socket, union sockunion *su, const char *password) { int ret = -1; int en = ENOSYS; +#if HAVE_DECL_TCP_MD5SIG union sockunion su2; +#endif /* HAVE_TCP_MD5SIG */ assert (socket >= 0); @@ -504,8 +504,8 @@ bfd_client_sendmsg (struct zclient *zclient, int command) if (ret < 0) { if (bfd_debug) - zlog_debug ("bfd_client_sendmsg %d: zclient_send_message() failed", - getpid()); + zlog_debug ("bfd_client_sendmsg %ld: zclient_send_message() failed", + (long) getpid()); return; } diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 54ed11da81..6cfed0f2c6 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -2087,10 +2087,10 @@ static void show_multicast_interfaces(struct vty *vty) inet_ntoa(ifaddr), ifp->ifindex, pim_ifp->mroute_vif_index, - vreq.icount, - vreq.ocount, - vreq.ibytes, - vreq.obytes, + (unsigned long) vreq.icount, + (unsigned long) vreq.ocount, + (unsigned long) vreq.ibytes, + (unsigned long) vreq.obytes, VTY_NEWLINE); } } diff --git a/zebra/rtread_getmsg.c b/zebra/rtread_getmsg.c index 6d2edde640..9defa49bfd 100644 --- a/zebra/rtread_getmsg.c +++ b/zebra/rtread_getmsg.c @@ -91,7 +91,7 @@ handle_route_entry (mib2_ipRouteEntry_t *routeEntry) gateway.s_addr = routeEntry->ipRouteNextHop; rib_add_ipv4 (ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &prefix, - &gateway, NULL, 0, VRF_DEFAULT, 0, 0, 0, SAFI_UNICAST); + &gateway, NULL, 0, VRF_DEFAULT, 0, 0, 0, 0, SAFI_UNICAST); } void |