Browse Source

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>
Andrew Certain 7 years ago
parent
commit
703819a931
2 changed files with 2 additions and 2 deletions
  1. 1 1
      ospfd/ospf_te.c
  2. 1 1
      ospfd/ospf_te.h

+ 1 - 1
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. */

+ 1 - 1
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