From 0345eb582b29f77d8de6824d661a3cef345942b1 Mon Sep 17 00:00:00 2001 From: Adam Honse Date: Wed, 2 Sep 2020 19:03:43 -0500 Subject: [PATCH] More warning fixes --- .../AorusCPUCoolerControllerDetect.cpp | 2 +- .../CoolerMasterControllerDetect.cpp | 2 +- .../EKController/EKControllerDetect.cpp | 2 +- .../HoltekControllerDetect.cpp | 2 +- .../HyperXPulsefireSurgeController.cpp | 2 +- .../LogitechControllerDetect.cpp | 2 +- .../PolychromeController.cpp | 1 - .../RGBFusion2USBControllerDetect.cpp | 5 +++-- .../RedragonControllerDetect.cpp | 2 +- .../SteelSeriesApexController.cpp | 2 +- .../SteelSeriesControllerDetect.cpp | 2 +- .../SteelSeriesRivalController.cpp | 18 ++++++++++++++++-- .../TecknetControllerDetect.cpp | 2 +- RGBController/RGBController.cpp | 2 +- RGBController/RGBController_AuraCore.cpp | 2 +- .../RGBController_SteelSeriesRival.cpp | 3 +++ i2c_smbus/i2c_smbus_linux.cpp | 1 - qt/DeviceView.cpp | 2 +- serial_port/find_usb_serial_port_linux.cpp | 1 - 19 files changed, 35 insertions(+), 20 deletions(-) diff --git a/Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp b/Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp index 8561280a..dac2e98c 100644 --- a/Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp +++ b/Controllers/AorusCPUCoolerController/AorusCPUCoolerControllerDetect.cpp @@ -43,7 +43,7 @@ void DetectAorusCPUCoolerControllers(std::vector& 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 index 6b18d7ed..936eb218 100644 --- a/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp +++ b/Controllers/CoolerMasterController/CoolerMasterControllerDetect.cpp @@ -44,7 +44,7 @@ void DetectCoolerMasterControllers(std::vector& 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 index 5fe86035..c1b1b393 100644 --- a/Controllers/EKController/EKControllerDetect.cpp +++ b/Controllers/EKController/EKControllerDetect.cpp @@ -42,7 +42,7 @@ void DetectEKControllers(std::vector& 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 index b6a289fa..a341f3d8 100644 --- a/Controllers/HoltekController/HoltekControllerDetect.cpp +++ b/Controllers/HoltekController/HoltekControllerDetect.cpp @@ -37,7 +37,7 @@ void DetectHoltekControllers(std::vector& 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 index ee4e1fda..e53ba458 100644 --- 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 index 39070f23..cd1af48d 100644 --- a/Controllers/LogitechController/LogitechControllerDetect.cpp +++ b/Controllers/LogitechController/LogitechControllerDetect.cpp @@ -90,7 +90,7 @@ void DetectLogitechControllers(std::vector& 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 index a52b9543..e3be0e45 100644 --- 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 index b42591b1..0910421e 100644 --- a/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp +++ b/Controllers/RGBFusion2USBController/RGBFusion2USBControllerDetect.cpp @@ -35,7 +35,7 @@ void DetectRGBFusion2USBControllers(std::vector &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 &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 index 5d9f8ef7..a4a1081a 100644 --- a/Controllers/RedragonController/RedragonControllerDetect.cpp +++ b/Controllers/RedragonController/RedragonControllerDetect.cpp @@ -73,7 +73,7 @@ void DetectRedragonControllers(std::vector& 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 index 5687e63c..ec27a33c 100644 --- a/Controllers/SteelSeriesController/SteelSeriesApexController.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesApexController.cpp @@ -45,7 +45,7 @@ SteelSeriesApexController::~SteelSeriesApexController() void SteelSeriesApexController::SetMode ( unsigned char mode, - std::vector colors + std::vector /*colors*/ ) { unsigned char mode_colors[9]; diff --git a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp index 522848a3..d76032ce 100644 --- a/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp +++ b/Controllers/SteelSeriesController/SteelSeriesControllerDetect.cpp @@ -98,7 +98,7 @@ void DetectSteelSeriesControllers(std::vector& 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 index 1f549d66..8d89c19c 100644 --- 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 index d051f73d..bf4c8b94 100644 --- a/Controllers/TecknetController/TecknetControllerDetect.cpp +++ b/Controllers/TecknetController/TecknetControllerDetect.cpp @@ -55,7 +55,7 @@ void DetectTecknetControllers(std::vector& 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 index d3f1d82d..d97a24b4 100644 --- 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 index a825eded..3cd114a3 100644 --- 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 index 91026166..fbd620fb 100644 --- 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 index ba5ca7be..a72c44bc 100644 --- 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 &busses) if(dir == NULL) { - closedir(dir); return; } diff --git a/qt/DeviceView.cpp b/qt/DeviceView.cpp index 749d2400..c170f15a 100644 --- 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 index 50706de7..2e9a22b2 100644 --- a/serial_port/find_usb_serial_port_linux.cpp +++ b/serial_port/find_usb_serial_port_linux.cpp @@ -33,7 +33,6 @@ std::vector find_usb_serial_port(unsigned short vid, unsigned sho if(dir == NULL) { - closedir(dir); return ret_vector; }