Compare commits

...
Author SHA1 Message Date
Adam Honse 0083d45103 Replace most instances of sprintf() with snprintf() 2023-03-02 00:14:17 -06:00
Adam Honse a67430cf04 change i2c path 2023-02-02 21:31:03 -06:00
15 changed files with 42 additions and 42 deletions
@@ -138,7 +138,7 @@ int AuraTUFKeyboardController::GetLayout()
{ {
char layout[4]; char layout[4];
sprintf(layout, "%X", version); snprintf(layout, 4, "%X", version);
int layoutnum = std::stoi(std::string(layout, 1)); int layoutnum = std::stoi(std::string(layout, 1));
@@ -240,7 +240,7 @@ void RGBController_CorsairLightingNode::SetupZones()
for (unsigned int channel_idx = 0; channel_idx < CORSAIR_LIGHTING_NODE_NUM_CHANNELS; channel_idx++) for (unsigned int channel_idx = 0; channel_idx < CORSAIR_LIGHTING_NODE_NUM_CHANNELS; channel_idx++)
{ {
char ch_idx_string[2]; char ch_idx_string[2];
sprintf(ch_idx_string, "%d", channel_idx + 1); snprintf(ch_idx_string, 2, "%d", channel_idx + 1);
zones[channel_idx].name = "Corsair Channel "; zones[channel_idx].name = "Corsair Channel ";
zones[channel_idx].name.append(ch_idx_string); zones[channel_idx].name.append(ch_idx_string);
@@ -264,7 +264,7 @@ void RGBController_CorsairLightingNode::SetupZones()
for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++)
{ {
char led_idx_string[4]; char led_idx_string[4];
sprintf(led_idx_string, "%d", led_ch_idx + 1); snprintf(led_idx_string, 4, "%d", led_ch_idx + 1);
led new_led; led new_led;
new_led.name = "Corsair Channel "; new_led.name = "Corsair Channel ";
@@ -18,7 +18,7 @@ GaiZhongGaiKeyboardController::GaiZhongGaiKeyboardController(hid_device* dev_han
| Obtaining the Firmware Version | | Obtaining the Firmware Version |
\*-----------------------------------------------------*/ \*-----------------------------------------------------*/
char str[10]; char str[10];
sprintf(str, "Ver%04X", info->release_number); snprintf(str, 10, "Ver%04X", info->release_number);
version = str; version = str;
} }
@@ -55,7 +55,7 @@ bool TestForGigabyteRGBFusion2GPUController(i2c_smbus_interface* bus, unsigned c
// Assemble C-string with respons for debugging // Assemble C-string with respons for debugging
char str[32]; char str[32];
for(int idx = 0; idx < read_sz; ++idx) for(int idx = 0; idx < read_sz; ++idx)
sprintf(&str[5*idx], " 0x%02X", data_readpkt[idx]); snprintf(&str[5*idx], 32, " 0x%02X", data_readpkt[idx]);
LOG_DEBUG("[%s] at address 0x%02X invalid. Expected 0xAB [0x*] but received:%s", GIGABYTEGPU_CONTROLLER_NAME2, address, str); LOG_DEBUG("[%s] at address 0x%02X invalid. Expected 0xAB [0x*] but received:%s", GIGABYTEGPU_CONTROLLER_NAME2, address, str);
pass = false; pass = false;
} }
@@ -27,7 +27,7 @@ HyperXAlloyOriginsCoreController::HyperXAlloyOriginsCoreController(hid_device* d
memset(fw_version_buf, '\0', sizeof(fw_version_buf)); memset(fw_version_buf, '\0', sizeof(fw_version_buf));
unsigned short version = dev_info->release_number; unsigned short version = dev_info->release_number;
sprintf(fw_version_buf, "%.2X.%.2X", (version & 0xFF00) >> 8, version & 0x00FF); snprintf(fw_version_buf, 8, "%.2X.%.2X", (version & 0xFF00) >> 8, version & 0x00FF);
firmware_version = fw_version_buf; firmware_version = fw_version_buf;
} }
@@ -122,7 +122,7 @@ void RoccatKovaController::FetchFirmwareVersion()
uint8_t version = buf[ROCCAT_KOVA_FIRMWARE_VERSION_IDX]; uint8_t version = buf[ROCCAT_KOVA_FIRMWARE_VERSION_IDX];
char version_str[5] {00}; char version_str[5] {00};
sprintf(version_str, "%.2f", version / 100.); snprintf(version_str, 5, "%.2f", version / 100.);
firmware_version = version_str; firmware_version = version_str;
} }
@@ -71,7 +71,7 @@ void RGBController_SRGBmodsPico::SetupZones()
for(unsigned int channel_idx = 0; channel_idx < SRGBMODS_PICO_NUM_CHANNELS; channel_idx++) for(unsigned int channel_idx = 0; channel_idx < SRGBMODS_PICO_NUM_CHANNELS; channel_idx++)
{ {
char ch_idx_string[2]; char ch_idx_string[2];
sprintf(ch_idx_string, "%d", channel_idx + 1); snprintf(ch_idx_string, 2, "%d", channel_idx + 1);
zones[channel_idx].name = "Channel "; zones[channel_idx].name = "Channel ";
zones[channel_idx].name.append(ch_idx_string); zones[channel_idx].name.append(ch_idx_string);
@@ -94,7 +94,7 @@ void RGBController_SRGBmodsPico::SetupZones()
for(unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) for(unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++)
{ {
char led_idx_string[4]; char led_idx_string[4];
sprintf(led_idx_string, "%d", led_ch_idx + 1); snprintf(led_idx_string, 4, "%d", led_ch_idx + 1);
led new_led; led new_led;
new_led.name = "LED "; new_led.name = "LED ";
@@ -147,7 +147,7 @@ void RGBController_ThermaltakeRiing::SetupZones()
for (unsigned int channel_idx = 0; channel_idx < THERMALTAKE_NUM_CHANNELS; channel_idx++) for (unsigned int channel_idx = 0; channel_idx < THERMALTAKE_NUM_CHANNELS; channel_idx++)
{ {
char ch_idx_string[2]; char ch_idx_string[2];
sprintf(ch_idx_string, "%d", channel_idx + 1); snprintf(ch_idx_string, 2, "%d", channel_idx + 1);
zones[channel_idx].name = "Riing Channel "; zones[channel_idx].name = "Riing Channel ";
zones[channel_idx].name.append(ch_idx_string); zones[channel_idx].name.append(ch_idx_string);
@@ -170,7 +170,7 @@ void RGBController_ThermaltakeRiing::SetupZones()
for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++)
{ {
char led_idx_string[3]; char led_idx_string[3];
sprintf(led_idx_string, "%d", led_ch_idx + 1); snprintf(led_idx_string, 3, "%d", led_ch_idx + 1);
led new_led; led new_led;
new_led.name = "Riing Channel "; new_led.name = "Riing Channel ";
@@ -74,7 +74,7 @@ void RGBController_ThermaltakeRiingQuad::SetupZones()
for (unsigned int channel_idx = 0; channel_idx < THERMALTAKE_QUAD_NUM_CHANNELS; channel_idx++) for (unsigned int channel_idx = 0; channel_idx < THERMALTAKE_QUAD_NUM_CHANNELS; channel_idx++)
{ {
char ch_idx_string[2]; char ch_idx_string[2];
sprintf(ch_idx_string, "%d", channel_idx + 1); snprintf(ch_idx_string, 2, "%d", channel_idx + 1);
zones[channel_idx].name = "Riing Channel "; zones[channel_idx].name = "Riing Channel ";
zones[channel_idx].name.append(ch_idx_string); zones[channel_idx].name.append(ch_idx_string);
@@ -97,7 +97,7 @@ void RGBController_ThermaltakeRiingQuad::SetupZones()
for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++)
{ {
char led_idx_string[3]; char led_idx_string[3];
sprintf(led_idx_string, "%d", led_ch_idx + 1); snprintf(led_idx_string, 3, "%d", led_ch_idx + 1);
led new_led; led new_led;
new_led.name = "Riing Channel "; new_led.name = "Riing Channel ";
@@ -207,7 +207,7 @@ void RGBController_ZalmanZSync::SetupZones()
for (unsigned int channel_idx = 0; channel_idx < ZALMAN_Z_SYNC_NUM_CHANNELS; channel_idx++) for (unsigned int channel_idx = 0; channel_idx < ZALMAN_Z_SYNC_NUM_CHANNELS; channel_idx++)
{ {
char ch_idx_string[2]; char ch_idx_string[2];
sprintf(ch_idx_string, "%d", channel_idx + 1); snprintf(ch_idx_string, 2, "%d", channel_idx + 1);
zones[channel_idx].name = "Channel "; zones[channel_idx].name = "Channel ";
zones[channel_idx].name.append(ch_idx_string); zones[channel_idx].name.append(ch_idx_string);
@@ -231,7 +231,7 @@ void RGBController_ZalmanZSync::SetupZones()
for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++) for (unsigned int led_ch_idx = 0; led_ch_idx < zones[channel_idx].leds_count; led_ch_idx++)
{ {
char led_idx_string[4]; char led_idx_string[4];
sprintf(led_idx_string, "%d", led_ch_idx + 1); snprintf(led_idx_string, 4, "%d", led_ch_idx + 1);
led new_led; led new_led;
new_led.name = "LED "; new_led.name = "LED ";
+1 -1
View File
@@ -663,7 +663,7 @@ bool i2c_smbus_i801_detect()
return(false); return(false);
} }
sprintf(bus->device_name, "Intel(R) SMBus - %X", bus->pci_device); snprintf(bus->device_name, 512, "Intel(R) SMBus - %X", bus->pci_device);
((i2c_smbus_i801 *)bus)->i801_smba = ReadConfigPortWord(0x20) & 0xFFFE; ((i2c_smbus_i801 *)bus)->i801_smba = ReadConfigPortWord(0x20) & 0xFFFE;
ResourceManager::get()->RegisterI2CBus(bus); ResourceManager::get()->RegisterI2CBus(bus);
+1 -1
View File
@@ -85,7 +85,7 @@ bool i2c_smbus_linux_detect()
char *ptr; char *ptr;
// Start looking for I2C adapters in /sys/bus/i2c/devices/ // Start looking for I2C adapters in /sys/bus/i2c/devices/
strcpy(driver_path, "/sys/bus/i2c/devices/"); strcpy(driver_path, "/sys/class/i2c-adapter/");
dir = opendir(driver_path); dir = opendir(driver_path);
if(dir == NULL) if(dir == NULL)
+5 -5
View File
@@ -271,19 +271,19 @@ bool i2c_smbus_nct6775_detect()
switch (val & SIO_ID_MASK) switch (val & SIO_ID_MASK)
{ {
case SIO_NCT5577_ID: case SIO_NCT5577_ID:
sprintf(bus->device_name, "Nuvoton NCT5577D SMBus at %X", smba); snprintf(bus->device_name, 512, "Nuvoton NCT5577D SMBus at %X", smba);
break; break;
case SIO_NCT6102_ID: case SIO_NCT6102_ID:
sprintf(bus->device_name, "Nuvoton NCT6102D/NCT6106D SMBus at %X", smba); snprintf(bus->device_name, 512, "Nuvoton NCT6102D/NCT6106D SMBus at %X", smba);
break; break;
case SIO_NCT6793_ID: case SIO_NCT6793_ID:
sprintf(bus->device_name, "Nuvoton NCT6793D SMBus at %X", smba); snprintf(bus->device_name, 512, "Nuvoton NCT6793D SMBus at %X", smba);
break; break;
case SIO_NCT6796_ID: case SIO_NCT6796_ID:
sprintf(bus->device_name, "Nuvoton NCT6796D SMBus at %X", smba); snprintf(bus->device_name, 512, "Nuvoton NCT6796D SMBus at %X", smba);
break; break;
case SIO_NCT6798_ID: case SIO_NCT6798_ID:
sprintf(bus->device_name, "Nuvoton NCT6798D SMBus at %X", smba); snprintf(bus->device_name, 512, "Nuvoton NCT6798D SMBus at %X", smba);
break; break;
} }
+1 -1
View File
@@ -179,7 +179,7 @@ bool i2c_smbus_nvapi_detect()
{ {
i2c_smbus_nvapi * nvapi_bus = new i2c_smbus_nvapi(gpu_handles[gpu_idx]); i2c_smbus_nvapi * nvapi_bus = new i2c_smbus_nvapi(gpu_handles[gpu_idx]);
sprintf(nvapi_bus->device_name, "NVidia NvAPI I2C on GPU %d", gpu_idx); snprintf(nvapi_bus->device_name, 512, "NVidia NvAPI I2C on GPU %d", gpu_idx);
res = NvAPI_GPU_GetPCIIdentifiers(gpu_handles[gpu_idx], &device_id, &sub_system_id, &revision_id, &ext_device_id); res = NvAPI_GPU_GetPCIIdentifiers(gpu_handles[gpu_idx], &device_id, &sub_system_id, &revision_id, &ext_device_id);
+11 -11
View File
@@ -22,12 +22,12 @@ std::string i2c_detect(i2c_smbus_interface * bus, int mode)
char line[128]; char line[128];
std::string text; std::string text;
sprintf(line, " 0 1 2 3 4 5 6 7 8 9 a b c d e f\r\n"); snprintf(line, 128, " 0 1 2 3 4 5 6 7 8 9 a b c d e f\r\n");
text.append(line); text.append(line);
for (i = 0; i < 128; i += 16) for (i = 0; i < 128; i += 16)
{ {
sprintf(line, "%02x: ", i); snprintf(line, 128, "%02x: ", i);
text.append(line); text.append(line);
for (j = 0; j < 16; j++) for (j = 0; j < 16; j++)
@@ -35,7 +35,7 @@ std::string i2c_detect(i2c_smbus_interface * bus, int mode)
/* Skip unwanted addresses */ /* Skip unwanted addresses */
if (i+j < first || i+j > last) if (i+j < first || i+j > last)
{ {
sprintf(line, " "); snprintf(line, 128, " ");
text.append(line); text.append(line);
continue; continue;
} }
@@ -63,16 +63,16 @@ std::string i2c_detect(i2c_smbus_interface * bus, int mode)
if (res < 0) if (res < 0)
{ {
sprintf(line, "-- "); snprintf(line, 128, "-- ");
text.append(line); text.append(line);
} }
else else
{ {
sprintf(line, "%02x ", i + j); snprintf(line, 128, "%02x ", i + j);
text.append(line); text.append(line);
} }
} }
sprintf(line, "\r\n"); snprintf(line, 128, "\r\n");
text.append(line); text.append(line);
} }
@@ -100,21 +100,21 @@ std::string i2c_dump(i2c_smbus_interface * bus, unsigned char address)
char line[128]; char line[128];
std::string text; std::string text;
sprintf(line, " 0 1 2 3 4 5 6 7 8 9 a b c d e f\r\n"); snprintf(line, 128, " 0 1 2 3 4 5 6 7 8 9 a b c d e f\r\n");
text.append(line); text.append(line);
for (i = 0; i < 0xFF; i += 16) for (i = 0; i < 0xFF; i += 16)
{ {
sprintf(line, "%04x: ", i + start); snprintf(line, 128, "%04x: ", i + start);
text.append(line); text.append(line);
for (j = 0; j < 16; j++) for (j = 0; j < 16; j++)
{ {
sprintf(line, "%02x ", (unsigned char )bus->i2c_smbus_read_byte_data(address, start + i + j)); snprintf(line, 128, "%02x ", (unsigned char )bus->i2c_smbus_read_byte_data(address, start + i + j));
text.append(line); text.append(line);
} }
sprintf(line, "\r\n"); snprintf(line, 128, "\r\n");
text.append(line); text.append(line);
} }
@@ -146,7 +146,7 @@ std::string i2c_read(i2c_smbus_interface * bus, unsigned char address, unsigned
for(i = 0; i < size; i++) for(i = 0; i < size; i++)
{ {
sprintf(line, "%02x ", (unsigned char)bus->i2c_smbus_read_byte(address)); snprintf(line, 128, "%02x ", (unsigned char)bus->i2c_smbus_read_byte(address));
text.append(line); text.append(line);
} }