Get rid of _U_, which was (mis)used in some places:

- It was used even though the variable actually *was* in use for
  some compile settings.
- It's not the c++ way.

2do: In case the definition of _U_ in Wireshark.pro is only used for
  the ui/qt directory, it should be removed to avoid further (ab)use.

Change-Id: I22d6269a66d6ed558035aad3e6702c4a9c8af1fa
Reviewed-on: https://code.wireshark.org/review/9665
Reviewed-by: Jörg Mayer <jmayer@loplof.de>

2 files changed, 9 insertions, 5 deletions

diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index e12e319758..a9865d4620 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -336,11 +336,13 @@ void MainStatusBar::popProfileStatus() {
     profile_status_.popText(STATUS_CTX_MAIN);
 }
 
-void MainStatusBar::updateCaptureStatistics(capture_session *cap_session _U_)
+void MainStatusBar::updateCaptureStatistics(capture_session *cap_session)
 {
     QString packets_str;
 
-#ifdef HAVE_LIBPCAP
+#ifndef HAVE_LIBPCAP
+    Q_UNUSED(cap_session)
+#else
     /* Do we have any packets? */
     if ((!cap_session || cap_session->cf == cap_file_) && cap_file_ && cap_file_->count) {
         packets_str.append(QString(tr("Packets: %1 %4 Displayed: %2 %4 Marked: %3"))
@@ -374,11 +376,13 @@ void MainStatusBar::updateCaptureStatistics(capture_session *cap_session _U_)
     pushPacketStatus(packets_str);
 }
 
-void MainStatusBar::updateCaptureFixedStatistics(capture_session *cap_session _U_)
+void MainStatusBar::updateCaptureFixedStatistics(capture_session *cap_session)
 {
     QString packets_str;
 
-#ifdef HAVE_LIBPCAP
+#ifndef HAVE_LIBPCAP
+    Q_UNUSED(cap_session)
+#else
     /* Do we have any packets? */
     if (cap_session->count) {
         packets_str.append(QString(tr("Packets: %1"))
diff --git a/ui/qt/resolved_addresses_dialog.cpp b/ui/qt/resolved_addresses_dialog.cpp
index 7fe455f570..43334e2c5b 100644
--- a/ui/qt/resolved_addresses_dialog.cpp
+++ b/ui/qt/resolved_addresses_dialog.cpp
@@ -132,7 +132,7 @@ eth_hash_to_qstringlist(gpointer, gpointer value, gpointer sl_ptr)
 }
 
 static void
-manuf_hash_to_qstringlist(gpointer key _U_, gpointer value, gpointer sl_ptr)
+manuf_hash_to_qstringlist(gpointer key, gpointer value, gpointer sl_ptr)
 {
     QStringList *string_list = (QStringList *) sl_ptr;
     hashmanuf_t *manuf = (hashmanuf_t*)value;