From 116390b3e8c31db2b6b1ee3ef7b073e681deb2c9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 13 Aug 2018 03:10:02 -0700 Subject: [PATCH] We should use strlcpy instead of strncpy - this usage of strncpy was also showing warnings with GCC 8.2 --- managers/cheat_manager.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c index f6d6d303dc..44c13c0719 100644 --- a/managers/cheat_manager.c +++ b/managers/cheat_manager.c @@ -129,10 +129,8 @@ bool cheat_manager_save(const char *path, const char *cheat_database, bool overw if ( (!cheat_manager_state.cheats) || cheat_manager_state.size==0 ) return false ; - if ( cheat_database == NULL ) - { - strncpy(cheats_file, path, PATH_MAX_LENGTH) ; - } + if (!cheat_database) + strlcpy(cheats_file, path, sizeof(cheats_file)); else { fill_pathname_join(buf, cheat_database, path, sizeof(buf)); @@ -140,13 +138,9 @@ bool cheat_manager_save(const char *path, const char *cheat_database, bool overw fill_pathname_noext(cheats_file, buf, ".cht", sizeof(cheats_file)); } if ( !overwrite ) - { conf = config_file_new(cheats_file); - } else - { conf = config_file_new(NULL); - } if (!conf) conf = config_file_new(NULL);