EIGRP: Modernize packet parsing style.

[tcpdump] / print-cnfp.c

diff --git a/print-cnfp.c b/print-cnfp.c
index 4799ce1464160fc6b767795fa20458104d80e47a..101148fa86c0c138ef33315ffc46ca0cde4e0d7c 100644 (file)
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -47,7 +47,6 @@
 #include "netdissect-stdinc.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -247,7 +246,6 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -350,7 +348,6 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -456,7 +453,6 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 void
@@ -468,7 +464,6 @@ cnfp_print(netdissect_options *ndo, const u_char *cp)
         * First 2 bytes are the version number.
         */
        ndo->ndo_protocol = "cnfp";
-       ND_TCHECK_2(cp);
        ver = GET_BE_U_2(cp);
        switch (ver) {
 
@@ -488,9 +483,4 @@ cnfp_print(netdissect_options *ndo, const u_char *cp)
                ND_PRINT("NetFlow v%x", ver);
                break;
        }
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
-       return;
 }