build/solaris: fix one error and a few warnings

Signed-off-by: Renato Westphal <renato@openbsd.org>
This commit is contained in:
Renato Westphal 2016-08-26 20:46:24 -03:00 committed by Donald Sharp
parent 4e851f1fa7
commit ea8b7c71a7
5 changed files with 11 additions and 9 deletions

View File

@ -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;

View File

@ -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);

View File

@ -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;
}

View File

@ -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);
}
}

View File

@ -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