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/qt/conversation_dialog.cpp | |
| 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/qt/conversation_dialog.cpp')
| -rw-r--r-- | ui/qt/conversation_dialog.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index 599bf4c545..bec94d3118 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -346,10 +346,10 @@ public: return; } - src_addr = (char*)get_conversation_address(NULL, &conv_item->src_address, resolve_names); - dst_addr = (char*)get_conversation_address(NULL, &conv_item->dst_address, resolve_names); - src_port = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); - dst_port = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); + src_addr = get_conversation_address(NULL, &conv_item->src_address, resolve_names); + dst_addr = get_conversation_address(NULL, &conv_item->dst_address, resolve_names); + src_port = get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); + dst_port = get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); setText(CONV_COLUMN_SRC_ADDR, src_addr); setText(CONV_COLUMN_SRC_PORT, src_port); setText(CONV_COLUMN_DST_ADDR, dst_addr); @@ -403,14 +403,14 @@ public: switch (col) { case CONV_COLUMN_SRC_ADDR: { - char* addr_str = (char*)get_conversation_address(NULL, &conv_item->src_address, resolve_names); + char* addr_str = get_conversation_address(NULL, &conv_item->src_address, resolve_names); QString q_addr_str(addr_str); wmem_free(NULL, addr_str); return q_addr_str; } case CONV_COLUMN_SRC_PORT: if (resolve_names) { - char* port_str = (char*)get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); + char* port_str = get_conversation_port(NULL, conv_item->src_port, conv_item->ptype, resolve_names); QString q_port_str(port_str); wmem_free(NULL, port_str); return q_port_str; @@ -419,14 +419,14 @@ public: } case CONV_COLUMN_DST_ADDR: { - char* addr_str = (char*)get_conversation_address(NULL, &conv_item->dst_address, resolve_names); + char* addr_str = get_conversation_address(NULL, &conv_item->dst_address, resolve_names); QString q_addr_str(addr_str); wmem_free(NULL, addr_str); return q_addr_str; } case CONV_COLUMN_DST_PORT: if (resolve_names) { - char* port_str = (char*)get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); + char* port_str = get_conversation_port(NULL, conv_item->dst_port, conv_item->ptype, resolve_names); QString q_port_str(port_str); wmem_free(NULL, port_str); return q_port_str; @@ -707,7 +707,7 @@ void ConversationTreeWidget::filterActionTriggered() return; } - char* tmp_str = (char*)get_conversation_filter(conv_item, fad_to_cd_[fa->actionDirection()]); + char* tmp_str = get_conversation_filter(conv_item, fad_to_cd_[fa->actionDirection()]); QString filter(tmp_str); g_free(tmp_str); |