Make the short names for USB encspsulation types more regular.

Have them all be "usb-XXX", where XXX indicates the type of header.

Change-Id: I7f1bfea7e264b17c57f94c484d64d1cce91b9b78
Reviewed-on: https://code.wireshark.org/review/22147
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/wiretap/wtap.c b/wiretap/wtap.c
index e2d16877c729f358876ea96a4212213c59fc866d..2fc3303a1f72551953d851c6ed9f88e71ce39e31 100644 (file)
--- a/wiretap/wtap.c
+++ b/wiretap/wtap.c
@@ -649,7 +649,7 @@ static struct encap_type_info encap_table_base[] = {
        { "Juniper Voice PIC", "juniper-vp" },
 
        /* WTAP_ENCAP_USB_FREEBSD */
-       { "USB packets with FreeBSD header", "usb" },
+       { "USB packets with FreeBSD header", "usb-freebsd" },
 
        /* WTAP_ENCAP_IEEE802_16_MAC_CPS */
        { "IEEE 802.16 MAC Common Part Sublayer", "ieee-802-16-mac-cps" },
@@ -919,7 +919,7 @@ static struct encap_type_info encap_table_base[] = {
        { "Juniper VN", "juniper-vn" },
 
        /* WTAP_ENCAP_USB_DARWIN */
-       { "USB packets with Darwin (macOS, etc.) headers", "darwin-usb" },
+       { "USB packets with Darwin (macOS, etc.) headers", "usb-darwin" },
 
        /* WTAP_ENCAP_LORATAP */
        { "LoRaTap", "loratap"},