CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-arp.c

diff --git a/print-arp.c b/print-arp.c
index 7d3efe74fa02e74b2e9f092338d3111a98cda594..950c3b24ef18d37bad7e84ca75bd4b10ebad2ae3 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -21,9 +21,7 @@
 
 /* \summary: Address Resolution Protocol (ARP) printer */
 
 
 /* \summary: Address Resolution Protocol (ARP) printer */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -64,7 +62,7 @@ struct  arp_pkthdr {
 #define ARPOP_REVREPLY  4       /* response giving protocol address */
 #define ARPOP_INVREQUEST 8      /* request to identify peer */
 #define ARPOP_INVREPLY  9       /* response identifying peer */
 #define ARPOP_REVREPLY  4       /* response giving protocol address */
 #define ARPOP_INVREQUEST 8      /* request to identify peer */
 #define ARPOP_INVREPLY  9       /* response identifying peer */

-#define ARPOP_NAK       10      /* NAK - only valif for ATM ARP */
+#define ARPOP_NAK       10      /* NAK - only valid for ATM ARP */

 
 /*
  * The remaining fields are variable in size,
 
 /*
  * The remaining fields are variable in size,


@@ -179,7 +177,7 @@ struct  atmarp_pkthdr {
 static int
 isnonzero(netdissect_options *ndo, const u_char *a, size_t len)
 {
 static int
 isnonzero(netdissect_options *ndo, const u_char *a, size_t len)
 {

-       while (len > 0) {
+       while (len != 0) {

                if (GET_U_1(a) != 0)
                        return (1);
                a++;
                if (GET_U_1(a) != 0)
                        return (1);
                a++;


@@ -373,7 +371,7 @@ arp_print(netdissect_options *ndo,
             linkaddr = LINKADDR_FRELAY;
             break;
         default:
             linkaddr = LINKADDR_FRELAY;
             break;
         default:

-            linkaddr = LINKADDR_ETHER;
+            linkaddr = LINKADDR_MAC48;

             break;
        }
 
             break;
        }