Update some comments to reflect reality.

Get rid of references to ep_ and se_ allocation in code that now uses
wmem allocation instead.

Fix API documentation of conversation_table.h routines to reflect that
as well - some APIs changed to pass wmem scopes.

Also, zbee_sec_key_hash() now takes the output buffer as an argument and
just returns it, and nobody actually uses the return value, so change it
to return void.

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

1 files changed, 6 insertions, 3 deletions

diff --git a/epan/conversation_table.h b/epan/conversation_table.h
index 61b9ce7f39..5c5699dad5 100644
--- a/epan/conversation_table.h
+++ b/epan/conversation_table.h
@@ -253,18 +253,20 @@ WS_DLL_PUBLIC void dissector_hostlist_init(const char *opt_arg, void* userdata);
 
 /** Get the string representation of an address.
  *
+ * @param allocator The wmem allocator to use when allocating the string
  * @param addr The address.
  * @param resolve_names Enable name resolution.
- * @return An ep_allocated string representing the address.
+ * @return A string representing the address.
  */
 WS_DLL_PUBLIC const char *get_conversation_address(wmem_allocator_t *allocator, address *addr, gboolean resolve_names);
 
 /** Get the string representation of a port.
  *
+ * @param allocator The wmem allocator to use when allocating the string
  * @param port The port number.
  * @param ptype The port type.
  * @param resolve_names Enable name resolution.
- * @return An ep_allocated string representing the port.
+ * @return A string representing the port.
  */
 WS_DLL_PUBLIC const char *get_conversation_port(wmem_allocator_t *allocator, guint32 port, port_type ptype, gboolean resolve_names);
 
@@ -279,7 +281,8 @@ WS_DLL_PUBLIC const char *get_conversation_filter(conv_item_t *conv_item, conv_d
 /** Get a display filter for the given hostlist.
  *
  * @param host The hostlist.
- * @return An ep_allocated string representing the conversation.
+ * @return A string, allocated using the wmem NULL allocator,
+ * representing the conversation.
  */
 WS_DLL_PUBLIC const char *get_hostlist_filter(hostlist_talker_t *host);