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>

1 files changed, 1 insertions, 13 deletions

diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index f86d062a10..db736c2e42 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -918,11 +918,6 @@ static void bthci_evt_vendor_prompt(packet_info *pinfo _U_, gchar* result)
     g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Vendor as");
 }
 
-static gpointer bthci_evt_vendor_value(packet_info *pinfo _U_)
-{
-    return NULL;
-}
-
 static void add_opcode(wmem_list_t *opcode_list, guint16 opcode, enum command_status command_status) {
     opcode_list_data_t *opcode_list_data;
 
@@ -7975,13 +7970,6 @@ proto_register_bthci_evt(void)
         &ett_expert
     };
 
-    /* Decode As handling */
-    static build_valid_func bthci_evt_vendor_da_build_value[1] = {bthci_evt_vendor_value};
-    static decode_as_value_t bthci_evt_vendor_da_values = {bthci_evt_vendor_prompt, 1, bthci_evt_vendor_da_build_value};
-    static decode_as_t bthci_evt_vendor_da = {"bthci_cmd", "Vendor", "bthci_cmd.vendor", 1, 0, &bthci_evt_vendor_da_values, NULL, NULL,
-            decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
-
-
     /* Register the protocol name and description */
     proto_bthci_evt = proto_register_protocol("Bluetooth HCI Event",
             "HCI_EVT", "bthci_evt");
@@ -7999,7 +7987,7 @@ proto_register_bthci_evt(void)
             "Bluetooth HCI version: 4.0 (Core) + Addendum 4",
             "Version of protocol supported by this dissector.");
 
-    register_decode_as(&bthci_evt_vendor_da);
+    register_decode_as_next_proto("bthci_cmd", "Vendor", "bthci_cmd.vendor", (build_label_func*)&bthci_evt_vendor_prompt);
 }