From d7bbcb24c996f624a238b188c615042a7b5da5d3 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Mon, 18 Oct 2021 17:51:31 +0200 Subject: [PATCH] fixes for warnings --- CMakeLists.txt | 1 + .../slsDetectorServer/src/programFpgaBlackfin.c | 7 +++---- slsDetectorServers/slsDetectorServer/src/programFpgaNios.c | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4db277142..a2281fb21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,6 +137,7 @@ sls_enable_cxx_warning("-Wnull-dereference") sls_enable_cxx_warning("-Wduplicated-cond") sls_disable_cxx_warning("-Wclass-memaccess") sls_disable_c_warning("-Wstringop-truncation") +sls_disable_c_warning("-Wformat-nonliteral") if(SLS_USE_SANITIZER) diff --git a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c index 5fdbcb4ad..0e9dd4117 100644 --- a/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c +++ b/slsDetectorServers/slsDetectorServer/src/programFpgaBlackfin.c @@ -75,7 +75,7 @@ int deleteOldFile(char *mess) { char *format = "rm -fr %s"; if (snprintf(cmd, MAX_STR_LENGTH, format, TEMP_PROG_FILE_NAME) >= MAX_STR_LENGTH) { - sptrcpy( + strcpy( mess, "Could not program fpga. Command to delete old file is too long\n"); LOG(logERROR, (mess)); @@ -242,9 +242,8 @@ int eraseFlash(char *mess) { char *format = "flash_eraseall %s"; if (snprintf(cmd, MAX_STR_LENGTH, format, flashDriveName) >= MAX_STR_LENGTH) { - ret = FAIL; - sptrcpy(mess, - "Could not program fpga. Command to erase flash is too long\n"); + strcpy(mess, + "Could not program fpga. Command to erase flash is too long\n"); LOG(logERROR, (mess)); return FAIL; } diff --git a/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c b/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c index f44838d9d..c82685224 100644 --- a/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c +++ b/slsDetectorServers/slsDetectorServer/src/programFpgaNios.c @@ -133,9 +133,8 @@ int eraseFlash(char *mess) { char *format = "flash_erase %s 0 0"; if (snprintf(cmd, MAX_STR_LENGTH, format, flashDriveName) >= MAX_STR_LENGTH) { - ret = FAIL; - sptrcpy(mess, - "Could not program fpga. Command to erase flash is too long\n"); + strcpy(mess, + "Could not program fpga. Command to erase flash is too long\n"); LOG(logERROR, (mess)); return FAIL; }