Remove useless 'return' at end of void functions (style)

diff --git a/print-802_15_4.c b/print-802_15_4.c
index db09ef367e44fc0bbc61a9df7cc479f04152ec9a..717acec84444b5e328994d93a67a848a5ac305ca 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -548,7 +548,6 @@ ieee802_15_4_print_addr(netdissect_options *ndo, const u_char *p,
                ND_PRINT("%s", GET_LE64ADDR_STRING(p));
                break;
        }
-       return;
 }
 
 /*
@@ -1300,7 +1299,6 @@ ieee802_15_4_print_mlme_ie_list(netdissect_options *ndo,
                p += sub_ie_len;
                ie_len -= 2 + sub_ie_len;
        } while (ie_len > 0);
-       return;
 }
 
 /*

diff --git a/print-ap1394.c b/print-ap1394.c
index 8e6454dd0ee38f18963d93056c0544ad917a83ce..37298d010555954cb895b56c6b80197c0b048e53 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -123,6 +123,4 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, caplen);
        }
-
-       return;
 }

diff --git a/print-atm.c b/print-atm.c
index 434d901c98fd041b756ef00d7b5f450adc8c5964..79275d159fbbe58847f0bc39194cfe0ee88352ef 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -552,5 +552,4 @@ oam_print(netdissect_options *ndo,
 
 trunc:
     nd_print_trunc(ndo);
-    return;
 }

diff --git a/print-babel.c b/print-babel.c
index 1671149a88c9c39e128571605d3bec5e04427cf0..d802a720f12f6dc6fcbd8054355d72e29da563be 100644 (file)
--- a/print-babel.c
+++ b/print-babel.c
@@ -81,7 +81,6 @@ babel_print(netdissect_options *ndo,
 
  trunc:
     nd_print_trunc(ndo);
-    return;
 }
 
 /* TLVs */
@@ -861,5 +860,4 @@ babel_print_v2(netdissect_options *ndo,
 
  invalid:
     nd_print_invalid(ndo);
-    return;
 }

diff --git a/print-bt.c b/print-bt.c
index 438ff9561cbc4a6e975d6d0a7607b8016d971577..406051f4115cb6d55e6be516f1428416eee4fd79 100644 (file)
--- a/print-bt.c
+++ b/print-bt.c
@@ -70,6 +70,5 @@ bt_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *
 
        if (!ndo->ndo_suppress_default_print)
                ND_DEFAULTPRINT(p, caplen);
-       return;
 }
 #endif

diff --git a/print-calm-fast.c b/print-calm-fast.c
index 6331a9c985e32a2da2eb86e35637ddca4207b9ff..ce040ce4dae5d31758af11101b94ad45434fa284 100644 (file)
--- a/print-calm-fast.c
+++ b/print-calm-fast.c
@@ -65,5 +65,4 @@ calm_fast_print(netdissect_options *ndo, const u_char *bp, u_int length, const s
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }

diff --git a/print-cnfp.c b/print-cnfp.c
index 69f905f5c94ea7c6ce3b42112fa206749e2cb99c..1a39c0db72a369dc09212c01b5b9322cb4991d2b 100644 (file)
--- a/print-cnfp.c
+++ b/print-cnfp.c
@@ -247,7 +247,6 @@ cnfp_v1_print(netdissect_options *ndo, const u_char *cp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -350,7 +349,6 @@ cnfp_v5_print(netdissect_options *ndo, const u_char *cp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -456,7 +454,6 @@ cnfp_v6_print(netdissect_options *ndo, const u_char *cp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 void

diff --git a/print-dccp.c b/print-dccp.c
index cb287f909193e5fb6c6bdfa15be4500f8fedd71d..902ae429688e2e595c66097daaf2c91fdae0744a 100644 (file)
--- a/print-dccp.c
+++ b/print-dccp.c
@@ -510,7 +510,6 @@ dccp_print(netdissect_options *ndo, const u_char *bp, const u_char *data2,
        return;
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static const struct tok dccp_option_values[] = {

diff --git a/print-decnet.c b/print-decnet.c
index e1c0c486e3f5f32cfb521901dda4bfb4101dabe4..301fdd9d1a16c2b95d577b3f21f467f868c9a743 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -586,7 +586,6 @@ decnet_print(netdissect_options *ndo,
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static int

diff --git a/print-dvmrp.c b/print-dvmrp.c
index f6f89ea0f192f1dbbaf469934108ee6283d189db..1ce7022d6a78ddb4e271ef055c81c10eaab34f48 100644 (file)
--- a/print-dvmrp.c
+++ b/print-dvmrp.c
@@ -156,7 +156,6 @@ dvmrp_print(netdissect_options *ndo,
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static int

diff --git a/print-eap.c b/print-eap.c
index 82d6084ad092c0ae5488961b3f43c9c23ca35700..00d40889bd898caeb84f895318071eccc4e47a24 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -254,7 +254,6 @@ eap_print(netdissect_options *ndo,
     return;
 trunc:
     nd_print_trunc(ndo);
-    return;
 }
 
 void

diff --git a/print-enc.c b/print-enc.c
index 607331906c9bc762c4d4c8f0fa70216a21156c84..8406caad1718914bed7d85d081c0e30df81dda96 100644 (file)
--- a/print-enc.c
+++ b/print-enc.c
@@ -160,6 +160,4 @@ enc_if_print(netdissect_options *ndo,
                ip6_print(ndo, p, length);
                break;
        }
-
-       return;
 }

diff --git a/print-gre.c b/print-gre.c
index 09b2be113306267228a6fb5a5861c2e4b7714ec7..68101fd0ebee39fe9713e8af49c534bba3703f19 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -105,7 +105,6 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void

diff --git a/print-hncp.c b/print-hncp.c
index 69ed9d6dd096ffd87dcb6ac8768120f9a7888982..cb7936034493a1622cfcdc9927bbd96882e5e1e0 100644 (file)
--- a/print-hncp.c
+++ b/print-hncp.c
@@ -864,5 +864,4 @@ hncp_print_rec(netdissect_options *ndo,
 
  invalid:
     nd_print_invalid(ndo);
-    return;
 }

diff --git a/print-icmp6.c b/print-icmp6.c
index a61675f52db150b24d410685a4bf60c3c1eab552..c535d3b753b2d9980cf5fd55327b5e0ec5c07e1e 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -843,7 +843,6 @@ rpl_printopts(netdissect_options *ndo, const uint8_t *opts, u_int length)
         return;
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -872,7 +871,6 @@ rpl_dio_print(netdissect_options *ndo,
        return;
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 static void
@@ -918,7 +916,6 @@ trunc:
 
 tooshort:
        ND_PRINT(" [|length too short]");
-       return;
 }
 
 static void
@@ -961,7 +958,6 @@ trunc:
 
 tooshort:
        ND_PRINT(" [|dao-length too short]");
-       return;
 }
 
 static void

diff --git a/print-ip.c b/print-ip.c
index 187d36e63bba4efb0d8eaf900d4116538f859f63..e6e6d7568c9dd97ce75bfc597b0444a5c5ce6310 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -502,7 +502,6 @@ ip_print(netdissect_options *ndo,
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 void

diff --git a/print-ipcomp.c b/print-ipcomp.c
index 98e2999cb862c82ff5b14ed1d10f13713bacdc4b..2404740190b0115743a4844f731b71a54496cc48 100644 (file)
--- a/print-ipcomp.c
+++ b/print-ipcomp.c
@@ -66,5 +66,4 @@ ipcomp_print(netdissect_options *ndo, const u_char *bp)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }

diff --git a/print-ipnet.c b/print-ipnet.c
index ba1e7005db2daf6cb6363ee885dee6702a6e7abd..0f745d70dfef064115dd3c4ccf19a8ae73d24d41 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -99,7 +99,6 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
                        ND_DEFAULTPRINT(p, caplen);
                break;
        }
-       return;
 }
 
 /*

diff --git a/print-isakmp.c b/print-isakmp.c
index 76e7dce107756325790398969cef2d154718b53e..52bf1fda5216d1f50e67120a1c015c4f90b43c06 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -3138,5 +3138,4 @@ isakmp_rfc3948_print(netdissect_options *ndo,
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }

diff --git a/print-krb.c b/print-krb.c
index c6c2fe7dc69f357bcf0851877a11e13099f6b0af..80b6cab625da3304bc3b2027ae182e2563d97a6a 100644 (file)
--- a/print-krb.c
+++ b/print-krb.c
@@ -258,5 +258,4 @@ krb_print(netdissect_options *ndo,
                /* Decode ASN.1 here "someday" */
                break;
        }
-       return;
 }

diff --git a/print-lisp.c b/print-lisp.c
index 6e9cbd143479e6a770b2ac3db4da913415ea63c8..920bfceb1ea1784a5ca7dbdcf2ca281158d10199 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -390,7 +390,6 @@ trunc:
        return;
 invalid:
        nd_print_invalid(ndo);
-       return;
 }
 
 static uint8_t
@@ -430,8 +429,6 @@ static void lisp_hdr_flag(netdissect_options *ndo, const lisp_map_register_hdr *
                ND_PRINT(" flags [%s],", bittok2str(map_notify_hdr_flag,
                         "none", GET_BE_U_4(lisp_hdr)));
        }
-
-       return;
 }
 
 static void action_flag(netdissect_options *ndo, uint8_t act_auth_inc_res)

diff --git a/print-lspping.c b/print-lspping.c
index e4986a5e43d06057cdfb98fbdd81a7ec66317566..ed74ad217658bde0277ac30a7d06c0d2ed2fedf8 100644 (file)
--- a/print-lspping.c
+++ b/print-lspping.c
@@ -1086,5 +1086,4 @@ tooshort:
     return;
 trunc:
     nd_print_trunc(ndo);
-    return;
 }

diff --git a/print-nflog.c b/print-nflog.c
index cc58e022dcb1e1cffc7b17885d8206c095f8ef90..9d8d759b55a9498f4b7a75a006907a7907bcc25d 100644 (file)
--- a/print-nflog.c
+++ b/print-nflog.c
@@ -230,7 +230,6 @@ nflog_if_print(netdissect_options *ndo,
 trunc:
        nd_print_trunc(ndo);
        ndo->ndo_ll_hdr_len += h_size - NFLOG_HDR_LEN;
-       return;
 }
 
 #endif /* DLT_NFLOG */

diff --git a/print-null.c b/print-null.c
index 1edff6af6e2168c74c098ca8625018bd8a7f2fb4..dea50ac2758a8065843519e7fbe27a9182568602 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -140,6 +140,4 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, caplen);
        }
-
-       return;
 }

diff --git a/print-pflog.c b/print-pflog.c
index 679c2dbd5fe51867a2372d0fd92df15445708937..814c635c16de87e7859bbc829c895a5ce8451a9d 100644 (file)
--- a/print-pflog.c
+++ b/print-pflog.c
@@ -180,5 +180,4 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 trunc:
        nd_print_trunc(ndo);
        ndo->ndo_ll_hdr_len += hdrlen;
-       return;
 }

diff --git a/print-pim.c b/print-pim.c
index 761ab6e1fc3c03b59d5f6f0f669456beaa4b86b5..dc9ca401f9de7f913aa810ad4f311e4a56857262 100644 (file)
--- a/print-pim.c
+++ b/print-pim.c
@@ -256,7 +256,6 @@ pimv1_join_prune_print(netdissect_options *ndo,
        return;
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 void
@@ -338,7 +337,6 @@ pimv1_print(netdissect_options *ndo,
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 /*
@@ -450,7 +448,6 @@ cisco_autorp_print(netdissect_options *ndo,
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }
 
 void

diff --git a/print-pktap.c b/print-pktap.c
index 5365617de12bb70d6568918f790fbde4132fb3a0..7ae10f0fd0e4714a3bf1d2caae9a3dfcb68ba44e 100644 (file)
--- a/print-pktap.c
+++ b/print-pktap.c
@@ -167,6 +167,5 @@ pktap_if_print(netdissect_options *ndo,
        }
 
        ndo->ndo_ll_hdr_len += hdrlen;
-       return;
 }
 #endif /* DLT_PKTAP */

diff --git a/print-ppi.c b/print-ppi.c
index 8534b00c969eff370f69787e1e0b889f5f0a16d8..774edfbaf8cefff90aa2b5574737eb4246344340 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -127,6 +127,5 @@ ppi_if_print(netdissect_options *ndo,
                hdrlen = 0;
        }
        ndo->ndo_ll_hdr_len += len + hdrlen;
-       return;
 }
 #endif /* DLT_PPI */

diff --git a/print-ptp.c b/print-ptp.c
index c6d8e544fdf74fe9c72c9cbf2ba0c35f2d755871..848200fabd545ff96a02cd7bf123af4adf69eead 100644 (file)
--- a/print-ptp.c
+++ b/print-ptp.c
@@ -457,7 +457,6 @@ ptp_print(netdissect_options *ndo, const u_char *bp, u_int len)
 
 trunc:
     nd_print_trunc(ndo);
-    return;
 }
 
 static void

diff --git a/print-radius.c b/print-radius.c
index 1e5c610e700745e90264c949bb20c447c1edca15..ee16877f6e5de3c71bbbc0462201ba6370665e26 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -1314,8 +1314,6 @@ print_attr_vector64(netdissect_options *ndo,
    }
 
    ND_PRINT("]");
-
-   return;
 }
 
 /***********************************/

diff --git a/print-raw.c b/print-raw.c
index 78e3e401b678a4538340b497c43cf1980bf8a2bd..9c6558fede0243a6a64a7c65e8f52bf93de245b4 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -42,6 +42,4 @@ raw_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
                ND_PRINT("ip: ");
 
        ipN_print(ndo, p, h->len);
-
-       return;
 }

diff --git a/print-ripng.c b/print-ripng.c
index e030c000cdce74939e4be3b2bddb0b39dfddbbec..9e5c504672022896fb6fa65183c97be007c9dccf 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -182,5 +182,4 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
 
 trunc:
        nd_print_trunc(ndo);
-       return;
 }

diff --git a/print-sl.c b/print-sl.c
index 3866bbc4825138143990dd9ba6b7879428dbdbd3..e82128782f69170156adc6d880e98337987a1095 100644 (file)
--- a/print-sl.c
+++ b/print-sl.c
@@ -91,8 +91,6 @@ sl_if_print(netdissect_options *ndo,
        default:
                ND_PRINT("ip v%u", IP_V(ip));
        }
-
-       return;
 }
 
 void
@@ -121,8 +119,6 @@ sl_bsdos_if_print(netdissect_options *ndo,
 #endif
 
        ip_print(ndo, (const u_char *)ip, length);
-
-       return;
 }
 
 static int

diff --git a/print-snmp.c b/print-snmp.c
index 439dc780fd96b99f4306f901df4344c2900f426e..a38fee2e4f25970a7035553a2918f67c5e5e78ef 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -1380,7 +1380,6 @@ snmppdu_print(netdissect_options *ndo,
        np += count;
 
        varbind_print(ndo, pduid, np, length);
-       return;
 }
 
 /*
@@ -1471,7 +1470,6 @@ trappdu_print(netdissect_options *ndo,
        np += count;
 
        varbind_print(ndo, TRAP, np, length);
-       return;
 }
 
 /*

diff --git a/print-someip.c b/print-someip.c
index 9eb63713f1a2bcc530b49b1f02916ac134f41364..505f6b4bb3b300000c47eae54f54212dd9e225b3 100644 (file)
--- a/print-someip.c
+++ b/print-someip.c
@@ -132,5 +132,4 @@ someip_print(netdissect_options *ndo, const u_char *bp, const u_int len)
             interface_version,
             tok2str(message_type_values, "Unknown", message_type),
             tok2str(return_code_values, "Unknown", return_code));
-    return;
 }

diff --git a/print-sunatm.c b/print-sunatm.c
index cad977551e44702af60298811d3ae52b4b78092d..1f4c979b519f27129f7a2995939105525955ee2a 100644 (file)
--- a/print-sunatm.c
+++ b/print-sunatm.c
@@ -103,6 +103,4 @@ sunatm_if_print(netdissect_options *ndo,
        caplen -= PKT_BEGIN_POS;
        length -= PKT_BEGIN_POS;
        atm_print(ndo, vpi, vci, traftype, p, length, caplen);
-
-       return;
 }

diff --git a/print-symantec.c b/print-symantec.c
index faacd117650f8fd27e129b763913cf8bfcaa98df..8fe0c79fe644315dad09b5197f97cdfcb5fec5e3 100644 (file)
--- a/print-symantec.c
+++ b/print-symantec.c
@@ -110,6 +110,4 @@ symantec_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_
                if (!ndo->ndo_suppress_default_print)
                        ND_DEFAULTPRINT(p, caplen);
        }
-
-       return;
 }

diff --git a/print-tftp.c b/print-tftp.c
index e90fb68c1da044e2152572db41bd9f9ce7706e4b..854564c4f298c551195480050175e0f49d28b9a1 100644 (file)
--- a/print-tftp.c
+++ b/print-tftp.c
@@ -197,5 +197,4 @@ tftp_print(netdissect_options *ndo,
        return;
 trunc:
        nd_print_trunc(ndo);
-       return;
 }

diff --git a/print-usb.c b/print-usb.c
index 7d2aece79976fbc22fe1f4e261177021cd1f3b96..c1b3da9223cf408952153757a699ac32c67c9bcf 100644 (file)
--- a/print-usb.c
+++ b/print-usb.c
@@ -260,8 +260,6 @@ usb_linux_48_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
        ndo->ndo_ll_hdr_len += sizeof (pcap_usb_header);
 
        usb_header_print(ndo, (const pcap_usb_header *) p);
-
-       return;
 }
 
 #ifdef DLT_USB_LINUX_MMAPPED
@@ -286,8 +284,6 @@ usb_linux_64_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
        ndo->ndo_ll_hdr_len += sizeof (pcap_usb_header_mmapped);
 
        usb_header_print(ndo, (const pcap_usb_header *) p);
-
-       return;
 }
 #endif /* DLT_USB_LINUX_MMAPPED */
 

diff --git a/print-zephyr.c b/print-zephyr.c
index b0f8cd31388a4480dfc64d30ccf0d679bc04185f..8d199b56bdee0f2a9588acdeba85cdaac7b221c2 100644 (file)
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -346,5 +346,4 @@ zephyr_print(netdissect_options *ndo, const u_char *cp, int length)
 
 trunc:
     nd_print_trunc(ndo);
-    return;
 }