ospfd: Fix compiler warnings

Two issues:

1) nbr->oi->ifp->name is an array it would
always evaluate to true.

2) There exist a code path where addr
would be used without initialization.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-05-15 13:41:23 -04:00 committed by Donald Sharp
parent 0bffa92902
commit cb2af5d07a
2 changed files with 3 additions and 3 deletions

View File

@ -4022,7 +4022,7 @@ ospf_proactively_arp (struct ospf_neighbor *nbr)
char *str_ptr;
int ret;
if (!nbr || !nbr->oi || !nbr->oi->ifp || !nbr->oi->ifp->name)
if (!nbr || !nbr->oi || !nbr->oi->ifp)
return;
str_ptr = strcpy (ping_nbr, "ping -c 1 -I ");

View File

@ -361,7 +361,7 @@ DEFUN (ospf_passive_interface,
"Interface's name\n")
{
struct interface *ifp;
struct in_addr addr;
struct in_addr addr = { .s_addr = INADDR_ANY };
int ret;
struct ospf_if_params *params;
struct route_node *rn;
@ -440,7 +440,7 @@ DEFUN (no_ospf_passive_interface,
"Interface's name\n")
{
struct interface *ifp;
struct in_addr addr;
struct in_addr addr = { .s_addr = INADDR_ANY };
struct ospf_if_params *params;
int ret;
struct route_node *rn;