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/endpoint_dialog.cpp | |
| 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 'ui/qt/endpoint_dialog.cpp')
| -rw-r--r-- | ui/qt/endpoint_dialog.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp index cdd1681dad..af99f3da51 100644 --- a/ui/qt/endpoint_dialog.cpp +++ b/ui/qt/endpoint_dialog.cpp @@ -237,8 +237,8 @@ public: return; } - addr_str = (char*)get_conversation_address(NULL, &endp_item->myaddress, resolve_names); - port_str = (char*)get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names); + addr_str = get_conversation_address(NULL, &endp_item->myaddress, resolve_names); + port_str = get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names); setText(ENDP_COLUMN_ADDR, addr_str); setText(ENDP_COLUMN_PORT, port_str); wmem_free(NULL, addr_str); @@ -295,14 +295,14 @@ public: switch (col) { case ENDP_COLUMN_ADDR: { - char* addr_str = (char*)get_conversation_address(NULL, &endp_item->myaddress, resolve_names); + char* addr_str = get_conversation_address(NULL, &endp_item->myaddress, resolve_names); QString q_addr_str(addr_str); wmem_free(NULL, addr_str); return q_addr_str; } case ENDP_COLUMN_PORT: if (resolve_names) { - char* port_str = (char*)get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names); + char* port_str = get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names); QString q_port_str(port_str); wmem_free(NULL, port_str); return q_port_str; |