osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

endpoint dialog: fix compilation when we don't HAVE_GEOIP. 

Also fix some indentation and white space.
Remove a break-after-return.

Bug: 12562
Change-Id: I912ccdac62aceaabcffec8f7739da56cc6036abf
Reviewed-on: https://code.wireshark.org/review/16159
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Jeff Morriss 2016-06-26 21:38:19 -04:00 committed by Pascal Quantin
parent 010f5bba63
commit 58ccf8e6b6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/qt/endpoint_dialog.cpp
View File

@ -265,7 +265,11 @@ public:
// Column text raw representation.
// Return a string, qulonglong, double, or invalid QVariant representing the raw column data.
#ifdef HAVE_GEOIP
QVariant colData(int col, bool resolve_names, bool strings_only) const {
#else
QVariant colData(int col, bool resolve_names, bool strings_only _U_) const {
#endif
hostlist_talker_t *endp_item = &g_array_index(conv_array_, hostlist_talker_t, conv_idx_);
if (!endp_item) {
@ -274,12 +278,12 @@ public:
switch (col) {
case ENDP_COLUMN_ADDR:
{
{
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 = get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names);
@ -340,7 +344,6 @@ public:
}
return geoip_str;
break;
}
#else
default:
@ -348,6 +351,7 @@ public:
#endif
}
}
virtual QVariant colData(int col, bool resolve_names) const { return colData(col, resolve_names, false); }
bool operator< (const QTreeWidgetItem &other) const