CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-cnfp.c

diff --git a/print-cnfp.c b/print-cnfp.c
index 1e4e1ae1bbf431b0f156dbef8e5bfbd21ade5da1..553b051d483b451f5cb04f1d656340fabe37c419 100644 (file)
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -37,17 +37,14 @@
  *
  * See
  *
- *    http://www.cisco.com/c/en/us/td/docs/net_mgmt/netflow_collection_engine/3-6/user/guide/format.html#wp1005892
+ *    https://www.cisco.com/c/en/us/td/docs/net_mgmt/netflow_collection_engine/3-6/user/guide/format.html#wp1005892
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -247,7 +244,6 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -350,7 +346,6 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -456,7 +451,6 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 void
@@ -468,7 +462,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 +481,4 @@ cnfp_print(netdissect_options *ndo, const u_char *cp)
                ND_PRINT("NetFlow v%x", ver);
                break;
        }
-       return;
-
-trunc:
-       nd_print_trunc(ndo);
-       return;
 }