From 41b85c245dfe736687fd8f851a6429d906dd3f86 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Thu, 28 Mar 2019 17:14:00 +0100 Subject: [PATCH] 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. --- daemon/gamemode-tests.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/daemon/gamemode-tests.c b/daemon/gamemode-tests.c index beebc6a..71f2a9d 100644 --- a/daemon/gamemode-tests.c +++ b/daemon/gamemode-tests.c @@ -445,16 +445,18 @@ int run_gpu_optimisation_tests(struct GameModeConfig *config) long expected_core = gpuinfo->nv_core; long expected_mem = gpuinfo->nv_mem; 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); + expected_amd_performance_level[CONFIG_VALUE_MAX - 1] = '\0'; /* Get current stats */ game_mode_get_gpu(gpuinfo); long original_nv_core = gpuinfo->nv_core; long original_nv_mem = gpuinfo->nv_mem; 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); + original_amd_performance_level[CONFIG_VALUE_MAX - 1] = '\0'; /* account for when settings are not set */ if (expected_nv_powermizer_mode == -1)