diff options
| author | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-05-15 19:41:23 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-05-20 15:34:32 +0200 |
| commit | cb2af5d07aa71150113ec28ad1945ef9ee8546ae (patch) | |
| tree | f614f39d46e043dae6d0e140e3941b0028308e04 /ospfd | |
| parent | isisd: Remove dead case (diff) | |
| download | frr-cb2af5d07aa71150113ec28ad1945ef9ee8546ae.tar.xz frr-cb2af5d07aa71150113ec28ad1945ef9ee8546ae.zip | |
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>
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_packet.c | 2 | ||||
| -rw-r--r-- | ospfd/ospf_vty.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 8bf07783e..f58044411 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -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 "); diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 75300fa35..89f2e1285 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -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; |