Fix the "pointer to function that generates a label" values.

build_label_func is a pointer type, pointing to a function that can be
used to generate a label for a "Decode As" entry.  There's no need to
have pointers to those pointers; have register_decode_as_next_proto()
take a build_label_func, not a build_label_func *, as its last argument,
assign that value rather than dereferencing it, get rid of unnecessary
casts, and fix the comment in epan/decode_as.h for that argument.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/epan/decode_as.h b/epan/decode_as.h
index e791236fb9..1642108f1a 100644
--- a/epan/decode_as.h
+++ b/epan/decode_as.h
@@ -86,11 +86,12 @@ struct dissector_table;
  * @param title The table name in which this dissector is found.
  * @param table_name The table name in which this dissector is found.
  * @param ui_name UI name for created dissector table.
- * @param label_func Optional prompt text for dissector.  If NULL, "Next level protocol as" is used.
+ * @param label_func Pointer to optional function to generate prompt text
+ *  for dissector.  If NULL, "Next level protocol as" is used.
  *
  * @return Created dissector table with Decode As support
 */
-WS_DLL_PUBLIC struct dissector_table* register_decode_as_next_proto(int proto, const gchar *title, const gchar *table_name, const gchar *ui_name, build_label_func* label_func);
+WS_DLL_PUBLIC struct dissector_table* register_decode_as_next_proto(int proto, const gchar *title, const gchar *table_name, const gchar *ui_name, build_label_func label_func);
 
 /* Walk though the dissector table and provide dissector_handle_t for each item in the table */
 WS_DLL_PUBLIC void decode_as_default_populate_list(const gchar *table_name, decode_as_add_to_list_func add_to_list, gpointer ui_element);