build_matrix.sh: Use the local libpcap before the system one

[tcpdump] / print-sflow.c

diff --git a/print-sflow.c b/print-sflow.c
index ea947ba2b4f0ce10d57332c600cf7184037a98a5..ca44421333a93b7e99255e12789efe17845478c4 100644 (file)
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -21,9 +21,7 @@
 
 /* specification: https://sflow.org/developers/specifications.php */
 
 
 /* specification: https://sflow.org/developers/specifications.php */
 

-#ifdef HAVE_CONFIG_H

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

-#endif

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


@@ -494,7 +492,7 @@ sflow_print_counter_records(netdissect_options *ndo,
     tptr = pointer;
     tlen = len;
 
     tptr = pointer;
     tlen = len;
 

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

        /* do we have the "header?" */
        if (tlen < sizeof(struct sflow_counter_record_t))
            return 1;
        /* do we have the "header?" */
        if (tlen < sizeof(struct sflow_counter_record_t))
            return 1;


@@ -683,14 +681,14 @@ sflow_print_flow_records(netdissect_options *ndo,
     tptr = pointer;
     tlen = len;
 
     tptr = pointer;
     tlen = len;
 

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

        /* do we have the "header?" */
        if (tlen < sizeof(struct sflow_flow_record_t))
            return 1;
 
        sflow_flow_record = (const struct sflow_flow_record_t *)tptr;
 
        /* do we have the "header?" */
        if (tlen < sizeof(struct sflow_flow_record_t))
            return 1;
 
        sflow_flow_record = (const struct sflow_flow_record_t *)tptr;
 

-       /* so, the funky encoding means we cannot blythly mask-off
+       /* so, the funky encoding means we cannot blithely mask-off

           bits, we must also check the enterprise. */
 
        enterprise = GET_BE_U_4(sflow_flow_record->format);
           bits, we must also check the enterprise. */
 
        enterprise = GET_BE_U_4(sflow_flow_record->format);


@@ -896,7 +894,7 @@ sflow_print(netdissect_options *ndo,
         tptr += sizeof(struct sflow_v6_datagram_t);
         tlen -= sizeof(struct sflow_v6_datagram_t);
     }
         tptr += sizeof(struct sflow_v6_datagram_t);
         tlen -= sizeof(struct sflow_v6_datagram_t);
     }

-    while (nsamples > 0 && tlen > 0) {
+    while (nsamples != 0 && tlen != 0) {

         sflow_sample = (const struct sflow_sample_header *)tptr;
 
         sflow_sample_type = (GET_BE_U_4(sflow_sample->format)&0x0FFF);
         sflow_sample = (const struct sflow_sample_header *)tptr;
 
         sflow_sample_type = (GET_BE_U_4(sflow_sample->format)&0x0FFF);