aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-usb-ccid.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-07-08 21:48:36 -0400
committerAnders Broman <a.broman58@gmail.com>2017-07-11 08:41:49 +0000
commit9b3c8d4515c9a1a307c141c25fa59694391efe3a (patch)
treeb71ff7c6590321de7a9f7141f2e4f3cf39bb426b /epan/dissectors/packet-usb-ccid.c
parentd4d30faeb85c5adf39aca3ae5e52db225c88ea48 (diff)
Expand register_decode_as_next_proto to include prompt string.
Many dissectors don't have an identifier to pass to a dissector table. When using Decode As they all have a "value" function that returns 0 just so something is returned. A first step to a cleaner refactor of the functionality is to allow dissectors to provide a "prompt" function when registering Decode As with register_decode_as_next_proto() so that the text exposed in the GUI can vary, but the function that returns 0 (nothing) can be consolidated under decode as registration functionality. This casts a wider net for register_decode_as_next_proto() use. Change-Id: I2995b3c251dae70f5f529b672473d25c6288ed5c Reviewed-on: https://code.wireshark.org/review/22562 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-usb-ccid.c')
-rw-r--r--epan/dissectors/packet-usb-ccid.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c
index 1a029afeb3..c7096424ec 100644
--- a/epan/dissectors/packet-usb-ccid.c
+++ b/epan/dissectors/packet-usb-ccid.c
@@ -882,8 +882,7 @@ proto_register_ccid(void)
subdissector_table = register_dissector_table(
"usbccid.subdissector", "USB CCID payload",
proto_ccid, FT_UINT32, BASE_HEX);
- register_decode_as_next_proto(
- "USB CCID", "Transport", "usbccid.subdissector");
+ register_decode_as_next_proto("USB CCID", "Transport", "usbccid.subdissector", NULL);
}
/* Handler registration */