diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-01-20 03:11:16 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-01-21 02:30:18 +0000 |
| commit | 4dd3f668dc9a86be0353d9572d9624bb7cca9bf5 (patch) | |
| tree | e7f7923826d4024d884047f270cc37c47669e1a6 /epan/conversation_table.h | |
| parent | 770eb649d847b620b5bc820a5cc6eef6e4c2d330 (diff) | |
Avoid returning malloced memory as const [-Wcast-qual]
Change-Id: I0b2c03cbde963d13d07ef13284d85b922eec3be9
Reviewed-on: https://code.wireshark.org/review/13439
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan/conversation_table.h')
| -rw-r--r-- | epan/conversation_table.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/conversation_table.h b/epan/conversation_table.h index 5c5699dad5..c0871924e2 100644 --- a/epan/conversation_table.h +++ b/epan/conversation_table.h @@ -258,7 +258,7 @@ WS_DLL_PUBLIC void dissector_hostlist_init(const char *opt_arg, void* userdata); * @param resolve_names Enable name resolution. * @return A string representing the address. */ -WS_DLL_PUBLIC const char *get_conversation_address(wmem_allocator_t *allocator, address *addr, gboolean resolve_names); +WS_DLL_PUBLIC char *get_conversation_address(wmem_allocator_t *allocator, address *addr, gboolean resolve_names); /** Get the string representation of a port. * @@ -268,7 +268,7 @@ WS_DLL_PUBLIC const char *get_conversation_address(wmem_allocator_t *allocator, * @param resolve_names Enable name resolution. * @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); +WS_DLL_PUBLIC char *get_conversation_port(wmem_allocator_t *allocator, guint32 port, port_type ptype, gboolean resolve_names); /** Get a display filter for the given conversation and direction. * @@ -276,7 +276,7 @@ WS_DLL_PUBLIC const char *get_conversation_port(wmem_allocator_t *allocator, gui * @param direction The desired direction. * @return An g_allocated string representing the conversation that must be freed */ -WS_DLL_PUBLIC const char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e direction); +WS_DLL_PUBLIC char *get_conversation_filter(conv_item_t *conv_item, conv_direction_e direction); /** Get a display filter for the given hostlist. * @@ -284,7 +284,7 @@ WS_DLL_PUBLIC const char *get_conversation_filter(conv_item_t *conv_item, conv_d * @return A string, allocated using the wmem NULL allocator, * representing the conversation. */ -WS_DLL_PUBLIC const char *get_hostlist_filter(hostlist_talker_t *host); +WS_DLL_PUBLIC char *get_hostlist_filter(hostlist_talker_t *host); /** Add some data to the conversation table. * |