More warning fixes

CalcProgrammer1 · CalcProgrammer1 · commit 0345eb582b29 · 2020-09-02T19:03:43.000-05:00
diff --git a/Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp b/Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp
@@ -43,7 +43,7 @@ void DetectAorusCPUCoolerControllers(std::vector<RGBController*>& rgb_controller
 {
     hid_init();
 
-    for(int device_idx = 0; device_idx < NUM_DEVICES; device_idx++)
+    for(unsigned int device_idx = 0; device_idx < NUM_DEVICES; device_idx++)
     {
         hid_device_info* info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);
 
diff --git a/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp b/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp
@@ -44,7 +44,7 @@ void DetectCoolerMasterControllers(std::vector<RGBController*>& rgb_controllers)
         hid_device* dev = NULL;
         if(info->vendor_id == COOLERMASTER_VID)
         {
-            for(int cm_pid_idx = 0; cm_pid_idx < COOLERMASTER_NUM_DEVICES; cm_pid_idx++)
+            for(unsigned int cm_pid_idx = 0; cm_pid_idx < COOLERMASTER_NUM_DEVICES; cm_pid_idx++)
             {
                 if((info->product_id        == cm_pids[cm_pid_idx][CM_PID])
                  &&(info->interface_number  == cm_pids[cm_pid_idx][CM_INTERFACE]))
diff --git a/Controllers/EKController/EKControllerDetect.cpp b/Controllers/EKController/EKControllerDetect.cpp
@@ -42,7 +42,7 @@ void DetectEKControllers(std::vector<RGBController*>& rgb_controllers)
         hid_device* dev = NULL;
         if(info->vendor_id == EK_VID)
         {
-            for(int ek_pid_idx = 0; ek_pid_idx < EK_NUM_DEVICES; ek_pid_idx++)
+            for(unsigned int ek_pid_idx = 0; ek_pid_idx < EK_NUM_DEVICES; ek_pid_idx++)
             {
                 if((info->product_id        == ek_pids[ek_pid_idx][EK_PID])
                  &&(info->interface_number  == ek_pids[ek_pid_idx][EK_INTERFACE]))
diff --git a/Controllers/HoltekController/HoltekControllerDetect.cpp b/Controllers/HoltekController/HoltekControllerDetect.cpp
@@ -37,7 +37,7 @@ void DetectHoltekControllers(std::vector<RGBController*>& rgb_controllers)
 {
     hid_init();
 
-    for(int device_idx = 0; device_idx < HOLTEK_NUM_DEVICES; device_idx++)
+    for(unsigned int device_idx = 0; device_idx < HOLTEK_NUM_DEVICES; device_idx++)
     {
         switch(device_list[device_idx].type)
         {
diff --git a/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp b/Controllers/HyperXMouseController/HyperXPulsefireSurgeController.cpp
@@ -72,7 +72,7 @@ void HyperXPulsefireSurgeController::SetProfileBrightness
     buf[0x03]   = 0x01;
     buf[0x04]   = 0x01;
     buf[0x05]   = 0x01;
-    buf[0x06]   = 0x64;
+    buf[0x06]   = brightness;
 
     /*-----------------------------------------------------*\
     | Send packet                                           |
diff --git a/Controllers/LogitechController/LogitechControllerDetect.cpp b/Controllers/LogitechController/LogitechControllerDetect.cpp
@@ -90,7 +90,7 @@ void DetectLogitechControllers(std::vector<RGBController*>& rgb_controllers)
 {
     hid_init();
 
-    for(int device_idx = 0; device_idx < LOGITECH_NUM_DEVICES; device_idx++)
+    for(unsigned int device_idx = 0; device_idx < LOGITECH_NUM_DEVICES; device_idx++)
     {
         switch(device_list[device_idx].type)
         {
diff --git a/Controllers/PolychromeController/PolychromeController.cpp b/Controllers/PolychromeController/PolychromeController.cpp
@@ -19,7 +19,6 @@ PolychromeController::PolychromeController(i2c_smbus_interface* bus, polychrome_
 
     unsigned short fw_version    = ReadFirmwareVersion();
     unsigned char  major_version = fw_version >> 8;
-    unsigned char  minor_version = fw_version & 0xFF;
 
     /*-----------------------------------------------------*\
     | Determine whether the device uses ASR LED or          |
diff --git a/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp b/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp
@@ -35,7 +35,7 @@ void DetectRGBFusion2USBControllers(std::vector<RGBController*> &rgb_controllers
         return;
     }
 
-    for(int dev_idx = 0; dev_idx < COUNT_RGBFUSION2_PIDS; dev_idx++)
+    for(unsigned int dev_idx = 0; dev_idx < COUNT_RGBFUSION2_PIDS; dev_idx++)
     {
         dev = NULL;
 
@@ -54,7 +54,8 @@ void DetectRGBFusion2USBControllers(std::vector<RGBController*> &rgb_controllers
             &&(info->product_id        == tmpPID))
 #endif
             {
-                hid_device * dev = hid_open_path(info->path);
+                dev = hid_open_path(info->path);
+                
                 if (dev)
                 {
                     RGBFusion2USBController * controller = new RGBFusion2USBController(dev, info->path, MB_info.getMainboard());
diff --git a/Controllers/RedragonController/RedragonControllerDetect.cpp b/Controllers/RedragonController/RedragonControllerDetect.cpp
@@ -73,7 +73,7 @@ void DetectRedragonControllers(std::vector<RGBController*>& rgb_controllers)
 
     hid_init();
 
-    for(int device_idx = 0; device_idx < REDRAGON_NUM_DEVICES; device_idx++)
+    for(unsigned int device_idx = 0; device_idx < REDRAGON_NUM_DEVICES; device_idx++)
     {
         dev = NULL;
 
diff --git a/Controllers/SteelSeriesController/SteelSeriesApexController.cpp b/Controllers/SteelSeriesController/SteelSeriesApexController.cpp
@@ -45,7 +45,7 @@ SteelSeriesApexController::~SteelSeriesApexController()
 void SteelSeriesApexController::SetMode
     (
     unsigned char mode,
-    std::vector<RGBColor> colors
+    std::vector<RGBColor> /*colors*/
     )
 {
     unsigned char mode_colors[9];
diff --git a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp
@@ -98,7 +98,7 @@ void DetectSteelSeriesControllers(std::vector<RGBController*>& rgb_controllers)
 
     hid_init();
 
-    for(int device_idx = 0; device_idx < STEELSERIES_NUM_DEVICES; device_idx++)
+    for(unsigned int device_idx = 0; device_idx < STEELSERIES_NUM_DEVICES; device_idx++)
     {
         dev = NULL;
 
diff --git a/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp b/Controllers/SteelSeriesController/SteelSeriesRivalController.cpp
@@ -70,15 +70,20 @@ void SteelSeriesRivalController::SetLightEffect
 {
     char usb_buf[9];
     memset(usb_buf, 0x00, sizeof(usb_buf));
-    switch (proto) {
+    switch (proto)
+    {
         case RIVAL_100:
             usb_buf[0x00]       = 0x07;
             usb_buf[0x01]       = 0x00;
             break;
+
         case RIVAL_300:
             usb_buf[0x00]       = 0x07;
             usb_buf[0x01]       = zone_id + 1;
             break;
+
+        default:
+            break;
     }
     usb_buf[0x02]       = effect;
     send_usb_msg(dev, usb_buf, 9);
@@ -100,8 +105,10 @@ void SteelSeriesRivalController::SetLightEffectAll
             SetLightEffect(0, effect);
             SetLightEffect(1, effect);
             break;
+        
+        default:
+            break;
     }
-
 }
 
 
@@ -126,7 +133,11 @@ void SteelSeriesRivalController::SetColor
             usb_buf[0x00]       = 0x08;
             usb_buf[0x01]       = zone_id + 1;
             break;
+
+        default:
+            break;
     }
+
     usb_buf[0x02]       = red;
     usb_buf[0x03]       = green;
     usb_buf[0x04]       = blue;
@@ -151,6 +162,9 @@ void SteelSeriesRivalController::SetColorAll
             SetColor(0, red, green, blue);
             SetColor(1, red, green, blue);
             break;
+
+        default:
+            break;
     }
 }
 
diff --git a/Controllers/TecknetController/TecknetControllerDetect.cpp b/Controllers/TecknetController/TecknetControllerDetect.cpp
@@ -55,7 +55,7 @@ void DetectTecknetControllers(std::vector<RGBController*>& rgb_controllers)
         hid_device* dev = NULL;
         if(info->vendor_id == TECKNET_VID)
         {
-            for(int pid_idx = 0; pid_idx < TECKNET_NUM_DEVICES; pid_idx++)
+            for(unsigned int pid_idx = 0; pid_idx < TECKNET_NUM_DEVICES; pid_idx++)
             {
                 if((info->vendor_id         == TECKNET_VID)
 #ifdef USE_HID_USAGE
diff --git a/RGBController/RGBController.cpp b/RGBController/RGBController.cpp
@@ -18,7 +18,7 @@ RGBController::~RGBController()
     /*---------------------------------------------------------*\
     | Delete the matrix map                                     |
     \*---------------------------------------------------------*/
-    for(int zone_index = 0; zone_index < zones.size(); zone_index++)
+    for(unsigned int zone_index = 0; zone_index < zones.size(); zone_index++)
     {
         if(zones[zone_index].matrix_map != NULL)
         {
diff --git a/RGBController/RGBController_AuraCore.cpp b/RGBController/RGBController_AuraCore.cpp
@@ -76,7 +76,7 @@ void RGBController_AuraCore::DeviceUpdateLEDs()
 
 void RGBController_AuraCore::UpdateZoneLEDs(int /*zone*/)
 {
-    for(int led_idx = 0; led_idx < leds.size(); led_idx++)
+    for(unsigned int led_idx = 0; led_idx < leds.size(); led_idx++)
     {
         UpdateSingleLED(led_idx);
     }
diff --git a/RGBController/RGBController_SteelSeriesRival.cpp b/RGBController/RGBController_SteelSeriesRival.cpp
@@ -105,6 +105,9 @@ void RGBController_SteelSeriesRival::UpdateZoneLEDs(int zone)
             case RIVAL_300:
                 rival->SetColor(zone, red, grn, blu);
                 break;
+
+            default:
+                break;
         }
     }
 }   
diff --git a/i2c_smbus/i2c_smbus_linux.cpp b/i2c_smbus/i2c_smbus_linux.cpp
@@ -54,7 +54,6 @@ void i2c_smbus_linux_detect(std::vector<i2c_smbus_interface*> &busses)
 
     if(dir == NULL)
     {
-        closedir(dir);
         return;
     }
 
diff --git a/qt/DeviceView.cpp b/qt/DeviceView.cpp
@@ -276,7 +276,7 @@ void DeviceView::setController(RGBController * controller_ptr)
                         }
                         else if(controller->leds[color_idx].name == "Key: Space")
                         {
-                            for(int map_idx2 = map_idx - 1; map_idx2 > led_y * map->width && map->map[map_idx2] == 0xFFFFFFFF; --map_idx2)
+                            for(unsigned int map_idx2 = map_idx - 1; map_idx2 > led_y * map->width && map->map[map_idx2] == 0xFFFFFFFF; --map_idx2)
                             {
                                 led_pos[color_idx].matrix_x -= atom;
                                 led_pos[color_idx].matrix_w += atom;
diff --git a/serial_port/find_usb_serial_port_linux.cpp b/serial_port/find_usb_serial_port_linux.cpp
@@ -33,7 +33,6 @@ std::vector<std::string *> find_usb_serial_port(unsigned short vid, unsigned sho
 
     if(dir == NULL)
     {
-        closedir(dir);
         return ret_vector;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void DetectAorusCPUCoolerControllers(std::vector<RGBController*>& rgb_controller`
`43`	`43`	`{`
`44`	`44`	`hid_init();`
`45`	`45`
`46`		`- for(int device_idx = 0; device_idx < NUM_DEVICES; device_idx++)`
	`46`	`+ for(unsigned int device_idx = 0; device_idx < NUM_DEVICES; device_idx++)`
`47`	`47`	`{`
`48`	`48`	`hid_device_info* info = hid_enumerate(device_list[device_idx].usb_vid, device_list[device_idx].usb_pid);`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ void DetectCoolerMasterControllers(std::vector<RGBController*>& rgb_controllers)`
`44`	`44`	`hid_device* dev = NULL;`
`45`	`45`	`if(info->vendor_id == COOLERMASTER_VID)`
`46`	`46`	`{`
`47`		`- for(int cm_pid_idx = 0; cm_pid_idx < COOLERMASTER_NUM_DEVICES; cm_pid_idx++)`
	`47`	`+ for(unsigned int cm_pid_idx = 0; cm_pid_idx < COOLERMASTER_NUM_DEVICES; cm_pid_idx++)`
`48`	`48`	`{`
`49`	`49`	`if((info->product_id == cm_pids[cm_pid_idx][CM_PID])`
`50`	`50`	`&&(info->interface_number == cm_pids[cm_pid_idx][CM_INTERFACE]))`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ void DetectEKControllers(std::vector<RGBController*>& rgb_controllers)`
`42`	`42`	`hid_device* dev = NULL;`
`43`	`43`	`if(info->vendor_id == EK_VID)`
`44`	`44`	`{`
`45`		`- for(int ek_pid_idx = 0; ek_pid_idx < EK_NUM_DEVICES; ek_pid_idx++)`
	`45`	`+ for(unsigned int ek_pid_idx = 0; ek_pid_idx < EK_NUM_DEVICES; ek_pid_idx++)`
`46`	`46`	`{`
`47`	`47`	`if((info->product_id == ek_pids[ek_pid_idx][EK_PID])`
`48`	`48`	`&&(info->interface_number == ek_pids[ek_pid_idx][EK_INTERFACE]))`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void DetectHoltekControllers(std::vector<RGBController*>& rgb_controllers)`
`37`	`37`	`{`
`38`	`38`	`hid_init();`
`39`	`39`
`40`		`- for(int device_idx = 0; device_idx < HOLTEK_NUM_DEVICES; device_idx++)`
	`40`	`+ for(unsigned int device_idx = 0; device_idx < HOLTEK_NUM_DEVICES; device_idx++)`
`41`	`41`	`{`
`42`	`42`	`switch(device_list[device_idx].type)`
`43`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ void DetectLogitechControllers(std::vector<RGBController*>& rgb_controllers)`
`90`	`90`	`{`
`91`	`91`	`hid_init();`
`92`	`92`
`93`		`- for(int device_idx = 0; device_idx < LOGITECH_NUM_DEVICES; device_idx++)`
	`93`	`+ for(unsigned int device_idx = 0; device_idx < LOGITECH_NUM_DEVICES; device_idx++)`
`94`	`94`	`{`
`95`	`95`	`switch(device_list[device_idx].type)`
`96`	`96`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void DetectRGBFusion2USBControllers(std::vector<RGBController*> &rgb_controllers`
`35`	`35`	`return;`
`36`	`36`	`}`
`37`	`37`
`38`		`- for(int dev_idx = 0; dev_idx < COUNT_RGBFUSION2_PIDS; dev_idx++)`
	`38`	`+ for(unsigned int dev_idx = 0; dev_idx < COUNT_RGBFUSION2_PIDS; dev_idx++)`
`39`	`39`	`{`
`40`	`40`	`dev = NULL;`
`41`	`41`
`@@ -54,7 +54,8 @@ void DetectRGBFusion2USBControllers(std::vector<RGBController*> &rgb_controllers`
`54`	`54`	`&&(info->product_id == tmpPID))`
`55`	`55`	`#endif`
`56`	`56`	`{`
`57`		`- hid_device * dev = hid_open_path(info->path);`
	`57`	`+ dev = hid_open_path(info->path);`
	`58`	`+`
`58`	`59`	`if (dev)`
`59`	`60`	`{`
`60`	`61`	`RGBFusion2USBController * controller = new RGBFusion2USBController(dev, info->path, MB_info.getMainboard());`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ void DetectRedragonControllers(std::vector<RGBController*>& rgb_controllers)`
`73`	`73`
`74`	`74`	`hid_init();`
`75`	`75`
`76`		`- for(int device_idx = 0; device_idx < REDRAGON_NUM_DEVICES; device_idx++)`
	`76`	`+ for(unsigned int device_idx = 0; device_idx < REDRAGON_NUM_DEVICES; device_idx++)`
`77`	`77`	`{`
`78`	`78`	`dev = NULL;`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ SteelSeriesApexController::~SteelSeriesApexController()`
`45`	`45`	`void SteelSeriesApexController::SetMode`
`46`	`46`	`(`
`47`	`47`	`unsigned char mode,`
`48`		`- std::vector<RGBColor> colors`
	`48`	`+ std::vector<RGBColor> /colors/`
`49`	`49`	`)`
`50`	`50`	`{`
`51`	`51`	`unsigned char mode_colors[9];`