diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 16:48:01 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 16:59:43 +0200 |
| commit | acd738fc7f5a8ca637e691e45346d74a149b75c9 (patch) | |
| tree | 62d1445b34e13fdfab132fa31cfb0ff9145b73ae /ospfd | |
| parent | Merge pull request #803 from opensourcerouting/redhat-doc-fixes-master (diff) | |
| download | frr-acd738fc7f5a8ca637e691e45346d74a149b75c9.tar.xz frr-acd738fc7f5a8ca637e691e45346d74a149b75c9.zip | |
*: fix GCC 7 switch/case fallthrough warnings
Need a comment on these.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_interface.c | 1 | ||||
| -rw-r--r-- | ospfd/ospf_nsm.c | 1 | ||||
| -rw-r--r-- | ospfd/ospf_packet.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index c09092e81..1e95e4312 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -1033,6 +1033,7 @@ ospf_vl_set_params (struct ospf_vl_data *vl_data, struct vertex *v) case LSA_LINK_TYPE_VIRTUALLINK: if (IS_DEBUG_OSPF_EVENT) zlog_debug ("found back link through VL"); + /* fallthru */ case LSA_LINK_TYPE_TRANSIT: case LSA_LINK_TYPE_POINTOPOINT: if (!IPV4_ADDR_SAME (&vl_data->peer_addr, diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c index d5c41802e..676069d6e 100644 --- a/ospfd/ospf_nsm.c +++ b/ospfd/ospf_nsm.c @@ -113,6 +113,7 @@ nsm_timer_set (struct ospf_neighbor *nbr) case NSM_Down: OSPF_NSM_TIMER_OFF (nbr->t_inactivity); OSPF_NSM_TIMER_OFF (nbr->t_hello_reply); + /* fallthru */ case NSM_Attempt: case NSM_Init: case NSM_TwoWay: diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index f33e0338a..951304c4d 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -1152,6 +1152,7 @@ ospf_db_desc_proc (struct stream *s, struct ospf_interface *oi, case -1: /* Neighbour has a more recent LSA, we must request it */ ospf_ls_request_add (nbr, new); + /* fallthru */ case 0: /* If we have a copy of this LSA, it's either less recent * and we're requesting it from neighbour (the case above), or @@ -1327,6 +1328,7 @@ ospf_db_desc (struct ip *iph, struct ospf_header *ospfh, through to case ExStart below. */ if (nbr->state != NSM_ExStart) break; + /* fallthru */ case NSM_ExStart: /* Initial DBD */ if ((IS_SET_DD_ALL (dd->flags) == OSPF_DD_FLAG_ALL) && |