Clean up more warnings

CalcProgrammer1 · CalcProgrammer1 · commit f568253c5124 · 2020-09-02T18:25:58.000-05:00
diff --git a/NetworkClient.cpp b/NetworkClient.cpp
@@ -381,7 +381,7 @@ void NetworkClient::ListenThreadFunction()
                 }
                 bytes_read += tmp_bytes_read;
 
-            } while (bytes_read < header.pkt_size);
+            } while ((unsigned int)bytes_read < header.pkt_size);
         }
 
         //Entire request received, select functionality based on request ID
@@ -448,7 +448,7 @@ void NetworkClient::ProcessReply_ControllerCount(unsigned int data_size, char *
     }
 }
 
-void NetworkClient::ProcessReply_ControllerData(unsigned int data_size, char * data, unsigned int dev_idx)
+void NetworkClient::ProcessReply_ControllerData(unsigned int /*data_size*/, char * data, unsigned int dev_idx)
 {
     RGBController_Network * new_controller = new RGBController_Network(this, dev_idx);
 
diff --git a/NetworkProtocol.h b/NetworkProtocol.h
@@ -20,7 +20,7 @@ typedef struct NetPacketHeader
     unsigned int        pkt_dev_idx;                /* Device index                                         */
     unsigned int        pkt_id;                     /* Packet ID                                            */
     unsigned int        pkt_size;                   /* Packet size                                          */
-};
+} NetPacketHeader;
 
 enum
 {
diff --git a/NetworkServer.cpp b/NetworkServer.cpp
@@ -446,7 +446,7 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info)
                 }
                 bytes_read += tmp_bytes_read;
 
-            } while (bytes_read < header.pkt_size);
+            } while ((unsigned int)bytes_read < header.pkt_size);
         }
 
         //Entire request received, select functionality based on request ID
@@ -584,7 +584,7 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info)
     ClientInfoChanged();
 }
 
-void NetworkServer::ProcessRequest_ClientString(SOCKET client_sock, unsigned int data_size, char * data)
+void NetworkServer::ProcessRequest_ClientString(SOCKET client_sock, unsigned int /*data_size*/, char * data)
 {
     ServerClientsMutex.lock();
     for(unsigned int this_idx = 0; this_idx < ServerClients.size(); this_idx++)
diff --git a/ResourceManager.cpp b/ResourceManager.cpp
@@ -161,15 +161,15 @@ void ResourceManager::DetectDevicesThreadFunction()
     /*-------------------------------------------------*\
     | Detect i2c busses                                 |
     \*-------------------------------------------------*/
-    for(int i2c_bus_detector_idx = 0; i2c_bus_detector_idx < i2c_bus_detectors.size(); i2c_bus_detector_idx++)
+    for(unsigned int i2c_bus_detector_idx = 0; i2c_bus_detector_idx < i2c_bus_detectors.size(); i2c_bus_detector_idx++)
     {
         i2c_bus_detectors[i2c_bus_detector_idx](busses);
     }
 
     /*-------------------------------------------------*\
     | Detect i2c devices                                |
     \*-------------------------------------------------*/
-    for(int i2c_detector_idx = 0; i2c_detector_idx < i2c_device_detectors.size(); i2c_detector_idx++)
+    for(unsigned int i2c_detector_idx = 0; i2c_detector_idx < i2c_device_detectors.size(); i2c_detector_idx++)
     {
         detection_string = i2c_device_detector_strings[i2c_detector_idx];
         DeviceListChanged();
@@ -207,7 +207,7 @@ void ResourceManager::DetectDevicesThreadFunction()
     /*-------------------------------------------------*\
     | Detect other devices                              |
     \*-------------------------------------------------*/
-    for(int detector_idx = 0; detector_idx < device_detectors.size(); detector_idx++)
+    for(unsigned int detector_idx = 0; detector_idx < device_detectors.size(); detector_idx++)
     {
         detection_string = device_detector_strings[detector_idx];
         DeviceListChanged();
diff --git a/cli.cpp b/cli.cpp
@@ -532,7 +532,7 @@ bool OptionDevice(int *current_device, std::string argument, Options *options, s
     }
 }
 
-bool OptionZone(int *current_device, int *current_zone, std::string argument, Options *options, std::vector<RGBController *> &rgb_controllers)
+bool OptionZone(int *current_device, int *current_zone, std::string argument, Options */*options*/, std::vector<RGBController *> &rgb_controllers)
 {
     ResourceManager::get()->WaitForDeviceDetection();
 
@@ -557,7 +557,7 @@ bool OptionZone(int *current_device, int *current_zone, std::string argument, Op
     }
 }
 
-bool OptionColor(int *currentDev, int *current_zone, std::string argument, Options *options)
+bool OptionColor(int *currentDev, int */*current_zone*/, std::string argument, Options *options)
 {
     DeviceOptions* currentDevOpts = GetDeviceOptionsForDevID(options, *currentDev);
 
@@ -587,7 +587,7 @@ bool OptionMode(int *currentDev, std::string argument, Options *options)
     return true;
 }
 
-bool OptionSize(int *current_device, int *current_zone, std::string argument, Options *options, std::vector<RGBController *> &rgb_controllers)
+bool OptionSize(int *current_device, int *current_zone, std::string argument, Options */*options*/, std::vector<RGBController *> &rgb_controllers)
 {
     const unsigned int new_size = std::stoi(argument);
 
@@ -1024,7 +1024,7 @@ void ApplyOptions(DeviceOptions& options, std::vector<RGBController *> &rgb_cont
 
 void WaitWhileServerOnline(NetworkServer* srv)
 {
-    while (network_server->GetOnline())
+    while (srv->GetOnline())
     {
         std::this_thread::sleep_for(1s);
     };
diff --git a/qt/DeviceView.cpp b/qt/DeviceView.cpp
@@ -216,9 +216,9 @@ void DeviceView::setController(RGBController * controller_ptr)
         {
             matrix_map_type * map = controller->zones[zone_idx].matrix_map;
 
-            for(int led_x = 0; led_x < map->width; led_x++)
+            for(unsigned int led_x = 0; led_x < map->width; led_x++)
             {
-                for(int led_y = 0; led_y < map->height; led_y++)
+                for(unsigned int led_y = 0; led_y < map->height; led_y++)
                 {
                     unsigned int map_idx    = led_y * map->width + led_x;
                     unsigned int color_idx  = map->map[map_idx] + controller->zones[zone_idx].start_idx;
@@ -281,7 +281,7 @@ void DeviceView::setController(RGBController * controller_ptr)
                                 led_pos[color_idx].matrix_x -= atom;
                                 led_pos[color_idx].matrix_w += atom;
                             }
-                            for(int map_idx2 = map_idx + 1; map_idx2 < (led_y + 1) * map->width && map->map[map_idx2] == 0xFFFFFFFF; ++map_idx2)
+                            for(unsigned int map_idx2 = map_idx + 1; map_idx2 < (led_y + 1) * map->width && map->map[map_idx2] == 0xFFFFFFFF; ++map_idx2)
                             {
                                 led_pos[color_idx].matrix_w += atom;
                             }
@@ -294,7 +294,7 @@ void DeviceView::setController(RGBController * controller_ptr)
         }
         else
         {
-            for(int i = 0; i < controller->zones[zone_idx].leds_count; i++)
+            for(unsigned int i = 0; i < controller->zones[zone_idx].leds_count; i++)
             {
                 led_pos[i + controller->zones[zone_idx].start_idx].matrix_x = zone_pos[zone_idx].matrix_x + (i % maxCols + ledPadding) * atom;
                 led_pos[i + controller->zones[zone_idx].start_idx].matrix_y = current_y + (i / maxCols + ledPadding) * atom;
diff --git a/qt/OpenRGBDevicePage.cpp b/qt/OpenRGBDevicePage.cpp
@@ -640,7 +640,7 @@ void Ui::OpenRGBDevicePage::UpdateModeUi()
                 for (std::size_t i = 0; i < device->modes[selected_mode].colors.size(); i++)
                 {
                     char id_buf[32];
-                    snprintf(id_buf, 16, "Mode Color %lu", i);
+                    snprintf(id_buf, 16, "Mode Color %u", i);
                     ui->LEDBox->addItem(id_buf);
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ void NetworkClient::ListenThreadFunction()`
`381`	`381`	`}`
`382`	`382`	`bytes_read += tmp_bytes_read;`
`383`	`383`
`384`		`- } while (bytes_read < header.pkt_size);`
	`384`	`+ } while ((unsigned int)bytes_read < header.pkt_size);`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`//Entire request received, select functionality based on request ID`
`@@ -448,7 +448,7 @@ void NetworkClient::ProcessReply_ControllerCount(unsigned int data_size, char *`
`448`	`448`	`}`
`449`	`449`	`}`
`450`	`450`
`451`		`-void NetworkClient::ProcessReply_ControllerData(unsigned int data_size, char * data, unsigned int dev_idx)`
	`451`	`+void NetworkClient::ProcessReply_ControllerData(unsigned int /data_size/, char * data, unsigned int dev_idx)`
`452`	`452`	`{`
`453`	`453`	`RGBController_Network * new_controller = new RGBController_Network(this, dev_idx);`
`454`	`454`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ typedef struct NetPacketHeader`
`20`	`20`	`unsigned int pkt_dev_idx; /* Device index */`
`21`	`21`	`unsigned int pkt_id; /* Packet ID */`
`22`	`22`	`unsigned int pkt_size; /* Packet size */`
`23`		`-};`
	`23`	`+} NetPacketHeader;`
`24`	`24`
`25`	`25`	`enum`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info)`
`446`	`446`	`}`
`447`	`447`	`bytes_read += tmp_bytes_read;`
`448`	`448`
`449`		`- } while (bytes_read < header.pkt_size);`
	`449`	`+ } while ((unsigned int)bytes_read < header.pkt_size);`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`//Entire request received, select functionality based on request ID`
`@@ -584,7 +584,7 @@ void NetworkServer::ListenThreadFunction(NetworkClientInfo * client_info)`
`584`	`584`	`ClientInfoChanged();`
`585`	`585`	`}`
`586`	`586`
`587`		`-void NetworkServer::ProcessRequest_ClientString(SOCKET client_sock, unsigned int data_size, char * data)`
	`587`	`+void NetworkServer::ProcessRequest_ClientString(SOCKET client_sock, unsigned int /data_size/, char * data)`
`588`	`588`	`{`
`589`	`589`	`ServerClientsMutex.lock();`
`590`	`590`	`for(unsigned int this_idx = 0; this_idx < ServerClients.size(); this_idx++)`
Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ bool OptionDevice(int current_device, std::string argument, Options options, s`
`532`	`532`	`}`
`533`	`533`	`}`
`534`	`534`
`535`		`-bool OptionZone(int current_device, int current_zone, std::string argument, Options options, std::vector<RGBController > &rgb_controllers)`
	`535`	`+bool OptionZone(int current_device, int current_zone, std::string argument, Options /options/, std::vector<RGBController > &rgb_controllers)`
`536`	`536`	`{`
`537`	`537`	`ResourceManager::get()->WaitForDeviceDetection();`
`538`	`538`
`@@ -557,7 +557,7 @@ bool OptionZone(int current_device, int current_zone, std::string argument, Op`
`557`	`557`	`}`
`558`	`558`	`}`
`559`	`559`
`560`		`-bool OptionColor(int currentDev, int current_zone, std::string argument, Options *options)`
	`560`	`+bool OptionColor(int currentDev, int /current_zone/, std::string argument, Options *options)`
`561`	`561`	`{`
`562`	`562`	`DeviceOptions* currentDevOpts = GetDeviceOptionsForDevID(options, *currentDev);`
`563`	`563`
`@@ -587,7 +587,7 @@ bool OptionMode(int currentDev, std::string argument, Options options)`
`587`	`587`	`return true;`
`588`	`588`	`}`
`589`	`589`
`590`		`-bool OptionSize(int current_device, int current_zone, std::string argument, Options options, std::vector<RGBController > &rgb_controllers)`
	`590`	`+bool OptionSize(int current_device, int current_zone, std::string argument, Options /options/, std::vector<RGBController > &rgb_controllers)`
`591`	`591`	`{`
`592`	`592`	`const unsigned int new_size = std::stoi(argument);`
`593`	`593`
`@@ -1024,7 +1024,7 @@ void ApplyOptions(DeviceOptions& options, std::vector<RGBController *> &rgb_cont`
`1024`	`1024`
`1025`	`1025`	`void WaitWhileServerOnline(NetworkServer* srv)`
`1026`	`1026`	`{`
`1027`		`- while (network_server->GetOnline())`
	`1027`	`+ while (srv->GetOnline())`
`1028`	`1028`	`{`
`1029`	`1029`	`std::this_thread::sleep_for(1s);`
`1030`	`1030`	`};`
Original file line number	Diff line number	Diff line change
`@@ -216,9 +216,9 @@ void DeviceView::setController(RGBController * controller_ptr)`
`216`	`216`	`{`
`217`	`217`	`matrix_map_type * map = controller->zones[zone_idx].matrix_map;`
`218`	`218`
`219`		`- for(int led_x = 0; led_x < map->width; led_x++)`
	`219`	`+ for(unsigned int led_x = 0; led_x < map->width; led_x++)`
`220`	`220`	`{`
`221`		`- for(int led_y = 0; led_y < map->height; led_y++)`
	`221`	`+ for(unsigned int led_y = 0; led_y < map->height; led_y++)`
`222`	`222`	`{`
`223`	`223`	`unsigned int map_idx = led_y * map->width + led_x;`
`224`	`224`	`unsigned int color_idx = map->map[map_idx] + controller->zones[zone_idx].start_idx;`
`@@ -281,7 +281,7 @@ void DeviceView::setController(RGBController * controller_ptr)`
`281`	`281`	`led_pos[color_idx].matrix_x -= atom;`
`282`	`282`	`led_pos[color_idx].matrix_w += atom;`
`283`	`283`	`}`
`284`		`- for(int map_idx2 = map_idx + 1; map_idx2 < (led_y + 1) * map->width && map->map[map_idx2] == 0xFFFFFFFF; ++map_idx2)`
	`284`	`+ for(unsigned int map_idx2 = map_idx + 1; map_idx2 < (led_y + 1) * map->width && map->map[map_idx2] == 0xFFFFFFFF; ++map_idx2)`
`285`	`285`	`{`
`286`	`286`	`led_pos[color_idx].matrix_w += atom;`
`287`	`287`	`}`
`@@ -294,7 +294,7 @@ void DeviceView::setController(RGBController * controller_ptr)`
`294`	`294`	`}`
`295`	`295`	`else`
`296`	`296`	`{`
`297`		`- for(int i = 0; i < controller->zones[zone_idx].leds_count; i++)`
	`297`	`+ for(unsigned int i = 0; i < controller->zones[zone_idx].leds_count; i++)`
`298`	`298`	`{`
`299`	`299`	`led_pos[i + controller->zones[zone_idx].start_idx].matrix_x = zone_pos[zone_idx].matrix_x + (i % maxCols + ledPadding) * atom;`
`300`	`300`	`led_pos[i + controller->zones[zone_idx].start_idx].matrix_y = current_y + (i / maxCols + ledPadding) * atom;`
Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ void Ui::OpenRGBDevicePage::UpdateModeUi()`
`640`	`640`	`for (std::size_t i = 0; i < device->modes[selected_mode].colors.size(); i++)`
`641`	`641`	`{`
`642`	`642`	`char id_buf[32];`
`643`		`- snprintf(id_buf, 16, "Mode Color %lu", i);`
	`643`	`+ snprintf(id_buf, 16, "Mode Color %u", i);`
`644`	`644`	`ui->LEDBox->addItem(id_buf);`
`645`	`645`	`}`
`646`	`646`