ICMPv6: Use a variable with a better name, simplifie some codes

[tcpdump] / print-nsh.c

diff --git a/print-nsh.c b/print-nsh.c
index 12a63cd6370c17454490b18b8d77d88955dfce5b..bf86a8bae4b99997d6ed007bfd722335c15a8510 100644 (file)
--- a/print-nsh.c
+++ b/print-nsh.c
@@ -25,9 +25,7 @@
 
 /* specification: RFC 8300 */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -181,7 +179,7 @@ nsh_print(netdissect_options *ndo, const u_char *bp, u_int len)
 
         if (md_type == MD_TYPE1) {
             if (length != 6) {
-                ND_PRINT(" (invalid length for the MD type)");
+                ND_PRINT(" (length for the MD type)");
                 goto invalid;
             }
             for (n = 0; n < length - 2; n++) {
@@ -189,8 +187,7 @@ nsh_print(netdissect_options *ndo, const u_char *bp, u_int len)
                 bp += NSH_HDR_WORD_SIZE;
             }
             past_headers = 1;
-        }
-        else if (md_type == MD_TYPE2) {
+        } else if (md_type == MD_TYPE2) {
             n = 0;
             while (n < length - 2) {
                 uint16_t tlv_class;