Modifying find_usb_serial_port() to return a vector

Controllers/HuePlusController/HuePlusControllerDetect.cpp

@@ -17,16 +17,21 @@
 
 void DetectHuePlusControllers(std::vector<RGBController*> &rgb_controllers)
 {
+    size_t i;
     HuePlusController* new_hueplus;
     RGBController_HuePlus* new_controller;
 
-    std::string portname = find_usb_serial_port(NZXT_HUE_PLUS_VID, NZXT_HUE_PLUS_PID);
-    if( portname != "" )
+    std::vector<std::string *> ports = find_usb_serial_port(NZXT_HUE_PLUS_VID, NZXT_HUE_PLUS_PID);
+
+    for (i = 0; i < ports.size(); i++)
     {
-        new_hueplus = new HuePlusController();
-        new_hueplus->Initialize((char *)portname.c_str());
+        if( *ports[i] != "" )
+        {
+            new_hueplus = new HuePlusController();
+            new_hueplus->Initialize((char *)ports[i]->c_str());
 
-        new_controller = new RGBController_HuePlus(new_hueplus);
-        rgb_controllers.push_back(new_controller);
+            new_controller = new RGBController_HuePlus(new_hueplus);
+            rgb_controllers.push_back(new_controller);
+        }
     }
 }   /* DetectHuePlusControllers() */

serial_port/find_usb_serial_port.h

@@ -6,5 +6,6 @@
 #include <fstream>
 #include <iostream>
 #include <string>
+#include <vector>
 
-std::string find_usb_serial_port(unsigned short vid, unsigned short pid);
+std::vector<std::string *> find_usb_serial_port(unsigned short vid, unsigned short pid);

serial_port/find_usb_serial_port_linux.cpp

@@ -17,13 +17,14 @@
 |                                                                       |
 \*---------------------------------------------------------------------*/
 
-std::string find_usb_serial_port(unsigned short vid, unsigned short pid)
+std::vector<std::string *> find_usb_serial_port(unsigned short vid, unsigned short pid)
 {
-    std::string     ret_string              = "";
-    DIR*            dir;
-    char            symlink_path[1024]      = {0};
-    struct dirent*  ent;
-    char            vid_pid[10]             = {0}; //Store VID/PID
+    std::vector<std::string *>  ret_vector;
+    std::string *               tmp_string;
+    DIR*                        dir;
+    char                        symlink_path[1024]  = {0};
+    struct dirent*              ent;
+    char                        vid_pid[10]         = {0}; //Store VID/PID
 
     /*-----------------------------------------------------------------*\
     | Open /sys/class/tty                                               |
@@ -32,7 +33,7 @@ std::string find_usb_serial_port(unsigned short vid, unsigned short pid)
 
     if(dir == NULL)
     {
-        return ret_string;
+        return ret_vector;
     }
 
     /*-----------------------------------------------------------------*\
@@ -109,10 +110,10 @@ std::string find_usb_serial_port(unsigned short vid, unsigned short pid)
                                 break;
                             }
                         }
-                        ret_string.append("/dev/");
-                        ret_string.append(port_string);
+                        tmp_string = new std::string("/dev/");
+                        tmp_string->append(port_string);
 
-                        return ret_string;
+                        ret_vector.push_back(tmp_string);
                     }
                 }
             }
@@ -121,6 +122,6 @@ std::string find_usb_serial_port(unsigned short vid, unsigned short pid)
         ent = readdir(dir);
     }
 
-    return ret_string;
+    return ret_vector;
 
 }   /* find_usb_serial_port() */

serial_port/find_usb_serial_port_win.cpp

@@ -24,18 +24,19 @@
 |                                                                       |
 \*---------------------------------------------------------------------*/
 
-std::string find_usb_serial_port(unsigned short vid, unsigned short pid)
+std::vector<std::string *> find_usb_serial_port(unsigned short vid, unsigned short pid)
 {
-    std::string     ret_str                 = "";
-    HDEVINFO        DeviceInfoSet;
-    DWORD           DeviceIndex             = 0;
-    SP_DEVINFO_DATA DeviceInfoData;
-    const char *    DevEnum                 = "USB";
-    char            ExpectedDeviceId[80]    = {0}; //Store hardware id
-    char            vid_pid[10]             = {0}; //Store VID/PID
-    char            szBuffer[1024]          = {0};
-    DEVPROPTYPE     ulPropertyType;
-    DWORD           dwSize                  = 0;
+    std::vector<std::string *>  ret_vector;
+    std::string *               tmp_string;
+    HDEVINFO                    DeviceInfoSet;
+    DWORD                       DeviceIndex             = 0;
+    SP_DEVINFO_DATA             DeviceInfoData;
+    const char *                DevEnum                 = "USB";
+    char                        ExpectedDeviceId[80]    = {0};  //Store hardware id
+    char                        vid_pid[10]             = {0};  //Store VID/PID
+    char                        szBuffer[1024]          = {0};
+    DEVPROPTYPE                 ulPropertyType;
+    DWORD                       dwSize                  = 0;
 
     /*-----------------------------------------------------------------*\
     | Create device hardware id                                         |
@@ -55,7 +56,7 @@ std::string find_usb_serial_port(unsigned short vid, unsigned short pid)
 
     if (DeviceInfoSet == INVALID_HANDLE_VALUE)
     {
-        return false;
+        return ret_vector;
     }
 
     /*-----------------------------------------------------------------*\
@@ -102,8 +103,8 @@ std::string find_usb_serial_port(unsigned short vid, unsigned short pid)
                     {
                         if(strncmp(pszPortName, "COM", 3) == 0)
                         {
-                            ret_str.append(pszPortName);
-                            return ret_str;
+                            tmp_string = new std::string(pszPortName);
+                            ret_vector.push_back(tmp_string);
                         }
                     }
 
@@ -119,6 +120,6 @@ std::string find_usb_serial_port(unsigned short vid, unsigned short pid)
         SetupDiDestroyDeviceInfoList(DeviceInfoSet);
     }
 
-    return ret_str;
+    return ret_vector;
 
 }   /* find_usb_serial_port() */