[Seq-cvs-commit] SF.net SVN: seq:[1448] showeq/branches/cn187_devel/src

[<cn...@us...>]

Revision: 1448
          http://sourceforge.net/p/seq/svn/1448
Author:   cn187
Date:     2024-03-10 18:38:51 +0000 (Sun, 10 Mar 2024)
Log Message:
-----------
Move enumerateDevices out of interface into util

Modified Paths:
--------------
    showeq/branches/cn187_devel/src/interface.cpp
    showeq/branches/cn187_devel/src/util.cpp
    showeq/branches/cn187_devel/src/util.h

Modified: showeq/branches/cn187_devel/src/interface.cpp
===================================================================
--- showeq/branches/cn187_devel/src/interface.cpp	2024-03-10 18:38:45 UTC (rev 1447)
+++ showeq/branches/cn187_devel/src/interface.cpp	2024-03-10 18:38:51 UTC (rev 1448)
@@ -71,7 +71,6 @@
 #include <unistd.h>
 #include <cstdlib>
 #include <cstdio>
-#include <ifaddrs.h>
 
 #include <QFont>
 #include <QApplication>
@@ -156,7 +155,7 @@
     m_netDiag(0),
     m_messageFilterDialog(0),
     m_guildListWindow(0),
-    m_deviceList(enumerateDevices())
+    m_deviceList(enumerateNetworkDevices())
 {
   setObjectName(name);
   setWindowFlags(Qt::Window);
@@ -5256,35 +5255,10 @@
   }
 }
 
-QStringList EQInterface::enumerateDevices()
-{
-    struct ifaddrs *ifaddr, *ifa;
-    int n;
-    QStringList devices;
 
-    if (getifaddrs(&ifaddr) == -1)
-    {
-        seqWarn("Could not enumerate network devices");
-        return QStringList();
-    }
-
-    for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++)
-    {
-        if (ifa->ifa_addr == NULL)
-            continue;
-
-        if (ifa->ifa_addr->sa_family == AF_INET)
-            devices.append(ifa->ifa_name);
-    }
-
-    freeifaddrs(ifaddr);
-
-    return devices;
-}
-
 QString EQInterface::promptForNetDevice()
 {
-    m_deviceList = enumerateDevices();
+    m_deviceList = enumerateNetworkDevices();
 
     int current = 0;
     if (m_packet)

Modified: showeq/branches/cn187_devel/src/util.cpp
===================================================================
--- showeq/branches/cn187_devel/src/util.cpp	2024-03-10 18:38:45 UTC (rev 1447)
+++ showeq/branches/cn187_devel/src/util.cpp	2024-03-10 18:38:51 UTC (rev 1448)
@@ -29,6 +29,7 @@
 #include <cstdio>
 #include <cstring>
 #include <sys/time.h>
+#include <ifaddrs.h>
 
 #include <QColor>
 #include <QFileInfo>
@@ -1044,3 +1045,32 @@
    return crc ^ 0xffffffffL; 
 }
 
+
+QStringList enumerateNetworkDevices()
+{
+    struct ifaddrs *ifaddr, *ifa;
+    int n;
+    QStringList devices;
+
+    if (getifaddrs(&ifaddr) == -1)
+    {
+        seqWarn("Could not enumerate network devices");
+        return QStringList();
+    }
+
+    for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++)
+    {
+        if (ifa->ifa_addr == NULL)
+            continue;
+
+        if (ifa->ifa_addr->sa_family == AF_INET)
+            devices.append(ifa->ifa_name);
+    }
+
+    freeifaddrs(ifaddr);
+
+    return devices;
+}
+
+
+

Modified: showeq/branches/cn187_devel/src/util.h
===================================================================
--- showeq/branches/cn187_devel/src/util.h	2024-03-10 18:38:45 UTC (rev 1447)
+++ showeq/branches/cn187_devel/src/util.h	2024-03-10 18:38:51 UTC (rev 1448)
@@ -82,6 +82,8 @@
 uint32_t calcCRC32(const uint8_t* p, uint32_t length);
 uint16_t calcCRC16(uint8_t* p, uint32_t length, uint32_t seed);
 
+QStringList enumerateNetworkDevices();
+
 // Templatized function to generate a string representing the bit pattern 
 // of the passed in value.  
 // Note: For use with integral data types.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.