diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-21 19:27:49 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-21 19:27:49 +0000 |
| commit | 39e92c066f210b0b550489e98d3b767ee1553e52 (patch) | |
| tree | 70928b277635d25cb717b8ceb103dd1d5e26f732 /ospf6d/ospf6_spf.c | |
| parent | 630a298ca76a0e37c263dc1d2c3053cbddc9ccb3 (diff) | |
| parent | ce01a2ca3f4501b75e55fe325c150eb9c2ae329d (diff) | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
bgpd/bgp_encap.c
bgpd/bgp_route.c
lib/command.c
lib/command.h
ospf6d/ospf6d.c
vtysh/vtysh.c
Diffstat (limited to 'ospf6d/ospf6_spf.c')
| -rw-r--r-- | ospf6d/ospf6_spf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index 67958be06c..df8925c453 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -444,7 +444,7 @@ void ospf6_spf_reason_string (unsigned int reason, char *buf, int size) if (!buf) return; - for (bit = 0; bit <= (sizeof(ospf6_spf_reason_str) / sizeof(char *)); bit++) + for (bit = 0; bit < array_size(ospf6_spf_reason_str); bit++) { if ((reason & (1 << bit)) && (len < size)) { |