grayhook
/
OpenRGB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace most instances of sprintf() with snprintf()

Browse Source
master
Adam Honse 3 years ago
parent c02d401b1d
commit ff8ac680ad
14 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
Controllers/AsusAuraUSBController/AsusAuraTUFKeyboardController.cpp
Unescape Escape View File

@ -138,7 +138,7 @@ int AuraTUFKeyboardController::GetLayout()
{
char layout[4];
sprintf(layout, "%X", version);
snprintf(layout, 4, "%X", version);
int layoutnum = std::stoi(std::string(layout, 1));

4
Controllers/CorsairLightingNodeController/RGBController_CorsairLightingNode.cpp
Unescape Escape View File

@ -240,7 +240,7 @@ void RGBController_CorsairLightingNode::SetupZones()
for (unsigned int channel_idx = 0; channel_idx < CORSAIR_LIGHTING_NODE_NUM_CHANNELS; channel_idx++)
{
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.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++)
{
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;
new_led.name = "Corsair Channel ";

2
Controllers/GaiZongGaiKeyboardController/GaiZhongGaiKeyboardController.cpp
Unescape Escape View File

@ -18,7 +18,7 @@ GaiZhongGaiKeyboardController::GaiZhongGaiKeyboardController(hid_device* dev_han
| Obtaining the Firmware Version |
\*-----------------------------------------------------*/
char str[10];
sprintf(str, "Ver%04X", info->release_number);
snprintf(str, 10, "Ver%04X", info->release_number);
version = str;
}

2
Controllers/GigabyteRGBFusion2GPUController/GigabyteRGBFusion2GPUControllerDetect.cpp
Unescape Escape View File

@ -55,7 +55,7 @@ bool TestForGigabyteRGBFusion2GPUController(i2c_smbus_interface* bus, unsigned c
// Assemble C-string with respons for debugging
char str[32];
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);
pass = false;
}

2
Controllers/HyperXKeyboardController/HyperXAlloyOriginsCoreController.cpp
Unescape Escape View File

@ -27,7 +27,7 @@ HyperXAlloyOriginsCoreController::HyperXAlloyOriginsCoreController(hid_device* d
memset(fw_version_buf, '\0', sizeof(fw_version_buf));
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;
}

2
Controllers/RoccatController/RoccatKovaController.cpp
Unescape Escape View File

@ -122,7 +122,7 @@ void RoccatKovaController::FetchFirmwareVersion()
uint8_t version = buf[ROCCAT_KOVA_FIRMWARE_VERSION_IDX];
char version_str[5] {00};
sprintf(version_str, "%.2f", version / 100.);
snprintf(version_str, 5, "%.2f", version / 100.);
firmware_version = version_str;
}

6
Controllers/SRGBmodsController/RGBController_SRGBmodsPico.cpp
Unescape Escape View File

@ -71,7 +71,7 @@ void RGBController_SRGBmodsPico::SetupZones()
for(unsigned int channel_idx = 0; channel_idx < SRGBMODS_PICO_NUM_CHANNELS; channel_idx++)
{
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.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++)
{
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;
new_led.name = "LED ";
@ -149,4 +149,4 @@ void RGBController_SRGBmodsPico::UpdateSingleLED(int led)
void RGBController_SRGBmodsPico::DeviceUpdateMode()
{
DeviceUpdateLEDs();
}
}

4
Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiing.cpp
Unescape Escape View File

@ -147,7 +147,7 @@ void RGBController_ThermaltakeRiing::SetupZones()
for (unsigned int channel_idx = 0; channel_idx < THERMALTAKE_NUM_CHANNELS; channel_idx++)
{
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.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++)
{
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;
new_led.name = "Riing Channel ";

4
Controllers/ThermaltakeRiingController/RGBController_ThermaltakeRiingQuad.cpp
Unescape Escape View File

@ -74,7 +74,7 @@ void RGBController_ThermaltakeRiingQuad::SetupZones()
for (unsigned int channel_idx = 0; channel_idx < THERMALTAKE_QUAD_NUM_CHANNELS; channel_idx++)
{
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.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++)
{
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;
new_led.name = "Riing Channel ";

4
Controllers/ZalmanZSyncController/RGBController_ZalmanZSync.cpp
Unescape Escape View File

@ -207,7 +207,7 @@ void RGBController_ZalmanZSync::SetupZones()
for (unsigned int channel_idx = 0; channel_idx < ZALMAN_Z_SYNC_NUM_CHANNELS; channel_idx++)
{
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.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++)
{
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;
new_led.name = "LED ";

2
i2c_smbus/i2c_smbus_i801.cpp
Unescape Escape View File

@ -663,7 +663,7 @@ bool i2c_smbus_i801_detect()
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;
ResourceManager::get()->RegisterI2CBus(bus);

12
i2c_smbus/i2c_smbus_nct6775.cpp
Unescape Escape View File

@ -115,7 +115,7 @@ s32 i2c_smbus_nct6775::nct6775_access(u16 addr, char read_write, u8 command, int
len = 0;
}
WriteIoPortByte(SMBHSTCMD, NCT6775_WRITE_BLOCK);
}
else
@ -271,19 +271,19 @@ bool i2c_smbus_nct6775_detect()
switch (val & SIO_ID_MASK)
{
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;
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;
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;
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;
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;
}

4
i2c_smbus/i2c_smbus_nvapi.cpp
Unescape Escape View File

@ -103,7 +103,7 @@ s32 i2c_smbus_nvapi::i2c_smbus_xfer(u8 addr, char read_write, u8 command, int mo
case I2C_SMBUS_WORD_DATA:
data->word = (i2c_data.data[0] | (i2c_data.data[1] << 8));
break;
case I2C_SMBUS_BLOCK_DATA:
case I2C_SMBUS_I2C_BLOCK_DATA:
data->block[0] = i2c_data.size;
@ -179,7 +179,7 @@ bool i2c_smbus_nvapi_detect()
{
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);

22
i2c_tools/i2c_tools.cpp
Unescape Escape View File

@ -22,12 +22,12 @@ std::string i2c_detect(i2c_smbus_interface * bus, int mode)
char line[128];
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);
for (i = 0; i < 128; i += 16)
{
sprintf(line, "%02x: ", i);
snprintf(line, 128, "%02x: ", i);
text.append(line);
for (j = 0; j < 16; j++)
@ -35,7 +35,7 @@ std::string i2c_detect(i2c_smbus_interface * bus, int mode)
/* Skip unwanted addresses */
if (i+j < first || i+j > last)
{
sprintf(line, " ");
snprintf(line, 128, " ");
text.append(line);
continue;
}
@ -63,16 +63,16 @@ std::string i2c_detect(i2c_smbus_interface * bus, int mode)
if (res < 0)
{
sprintf(line, "-- ");
snprintf(line, 128, "-- ");
text.append(line);
}
else
{
sprintf(line, "%02x ", i + j);
snprintf(line, 128, "%02x ", i + j);
text.append(line);
}
}
sprintf(line, "\r\n");
snprintf(line, 128, "\r\n");
text.append(line);
}
@ -100,21 +100,21 @@ std::string i2c_dump(i2c_smbus_interface * bus, unsigned char address)
char line[128];
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);
for (i = 0; i < 0xFF; i += 16)
{
sprintf(line, "%04x: ", i + start);
snprintf(line, 128, "%04x: ", i + start);
text.append(line);
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);
}
sprintf(line, "\r\n");
snprintf(line, 128, "\r\n");
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++)
{
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);
}

Write Preview
Loading…
Cancel
Save