diff options
| author | Andrew Certain <certain@amazon.com> | 2012-12-04 13:36:41 -0800 |
|---|---|---|
| committer | Scott Feldman <sfeldma@cumulusnetworks.com> | 2013-01-07 09:59:53 -0800 |
| commit | 703819a9314692f3a3b7f888887b0cebc15c18ae (patch) | |
| tree | 5a109e346ba409f3707bd5f041f5ffb3b2b5f94c | |
| parent | 7798b6321cd0c6281b1a119ac894ff3749e88cc1 (diff) | |
ospfd: Changed TE instance check to remove -Wtype-limits warning
Since LEGAL_TE_INSTANCE_RANGE() was being passed an unsigned int, a warning
was being thrown due to the compare against >= 0. Since this macro was used
only in one place, I removed the macro for an explict compare against a
constant for the MAX.
Signed-off-by: Scott Feldman <sfeldma@cumulusnetworks.com>
| -rw-r--r-- | ospfd/ospf_te.c | 2 | ||||
| -rw-r--r-- | ospfd/ospf_te.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c index 24e81052..587564a1 100644 --- a/ospfd/ospf_te.c +++ b/ospfd/ospf_te.c @@ -205,7 +205,7 @@ get_mpls_te_instance_value (void) { static u_int32_t seqno = 0; - if (LEGAL_TE_INSTANCE_RANGE (seqno + 1)) + if (seqno < MAX_LEGAL_TE_INSTANCE_NUM ) seqno += 1; else seqno = 1; /* Avoid zero. */ diff --git a/ospfd/ospf_te.h b/ospfd/ospf_te.h index e8511cdf..863d8ba8 100644 --- a/ospfd/ospf_te.h +++ b/ospfd/ospf_te.h @@ -41,7 +41,7 @@ * */ -#define LEGAL_TE_INSTANCE_RANGE(i) (0 <= (i) && (i) <= 0xffff) +#define MAX_LEGAL_TE_INSTANCE_NUM (0xffff) /* * 24 16 8 0 |