Rewrite strncpy to silence compiler warning

Instead of initializing the char array to 0 and writing N-1 bytes,
write N-1 bytes and set the last byte manually to 0. This seems
to make gcc happy.
This commit is contained in:
Christian Kellner 2019-03-28 17:14:00 +01:00
parent 34d86d30b1
commit 41b85c245d

View File

@ -445,16 +445,18 @@ int run_gpu_optimisation_tests(struct GameModeConfig *config)
long expected_core = gpuinfo->nv_core; long expected_core = gpuinfo->nv_core;
long expected_mem = gpuinfo->nv_mem; long expected_mem = gpuinfo->nv_mem;
long expected_nv_powermizer_mode = gpuinfo->nv_powermizer_mode; long expected_nv_powermizer_mode = gpuinfo->nv_powermizer_mode;
char expected_amd_performance_level[CONFIG_VALUE_MAX] = { 0 }; char expected_amd_performance_level[CONFIG_VALUE_MAX];
strncpy(expected_amd_performance_level, gpuinfo->amd_performance_level, CONFIG_VALUE_MAX - 1); strncpy(expected_amd_performance_level, gpuinfo->amd_performance_level, CONFIG_VALUE_MAX - 1);
expected_amd_performance_level[CONFIG_VALUE_MAX - 1] = '\0';
/* Get current stats */ /* Get current stats */
game_mode_get_gpu(gpuinfo); game_mode_get_gpu(gpuinfo);
long original_nv_core = gpuinfo->nv_core; long original_nv_core = gpuinfo->nv_core;
long original_nv_mem = gpuinfo->nv_mem; long original_nv_mem = gpuinfo->nv_mem;
long original_nv_powermizer_mode = gpuinfo->nv_powermizer_mode; long original_nv_powermizer_mode = gpuinfo->nv_powermizer_mode;
char original_amd_performance_level[CONFIG_VALUE_MAX] = { 0 }; char original_amd_performance_level[CONFIG_VALUE_MAX];
strncpy(original_amd_performance_level, gpuinfo->amd_performance_level, CONFIG_VALUE_MAX - 1); strncpy(original_amd_performance_level, gpuinfo->amd_performance_level, CONFIG_VALUE_MAX - 1);
original_amd_performance_level[CONFIG_VALUE_MAX - 1] = '\0';
/* account for when settings are not set */ /* account for when settings are not set */
if (expected_nv_powermizer_mode == -1) if (expected_nv_powermizer_mode == -1)