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 /ui/gtk/conversations_table.c | |
| parent | 770eb649d847b620b5bc820a5cc6eef6e4c2d330 (diff) | |
| download | wireshark-4dd3f668dc9a86be0353d9572d9624bb7cca9bf5.tar.gz | |
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 'ui/gtk/conversations_table.c')
| -rw-r--r-- | ui/gtk/conversations_table.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index 91e4ab13b0..7fc02e2eb0 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -1597,10 +1597,10 @@ draw_ct_table_addresses(conversations_table *ct) gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, CONV_INDEX_COLUMN, &idx, -1); conv_item = &g_array_index(ct->hash.conv_array, conv_item_t, idx); - src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); - dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); - src_port = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names); - dst_port = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names); + src_addr = get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); + dst_addr = get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); + src_port = get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names); + dst_port = get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names); gtk_list_store_set (store, &iter, CONV_COLUMN_SRC_ADDR, src_addr, CONV_COLUMN_SRC_PORT, src_port, @@ -1718,10 +1718,10 @@ draw_ct_table_data(conversations_table *ct) } else { char *src_addr, *dst_addr, *src_port, *dst_port; - src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); - dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); - src_port = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names); - dst_port = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names); + src_addr = get_conversation_address(NULL, &conv_item->src_address, ct->resolve_names); + dst_addr = get_conversation_address(NULL, &conv_item->dst_address, ct->resolve_names); + src_port = get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, ct->resolve_names); + dst_port = get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, ct->resolve_names); /* New row. All entries, including fixed ones */ gtk_list_store_insert_with_values(store, &iter, G_MAXINT, CONV_COLUMN_SRC_ADDR, src_addr, |