From 2ea041ca625e1649636117d0f4b468a9aa9b14d2 Mon Sep 17 00:00:00 2001 From: rilysh Date: Wed, 22 Mar 2023 21:21:41 +0530 Subject: [PATCH 1/2] fix GCC warnings on ret pointer and strncpy --- src/voglperf.c | 2 +- src/voglutils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/voglperf.c b/src/voglperf.c index d271e28..99f8eff 100644 --- a/src/voglperf.c +++ b/src/voglperf.c @@ -343,7 +343,7 @@ static int voglperf_logfile_open(const char *logfile_name, uint64_t seconds) g_logfile_time = seconds * 1000000000; - strncpy(g_logfile_name, logfile_name, sizeof(g_logfile_name)); + strncpy(g_logfile_name, logfile_name, sizeof(g_logfile_name) - 1); if (g_msqid != -1) { diff --git a/src/voglutils.cpp b/src/voglutils.cpp index 4a92a82..4b9ea99 100644 --- a/src/voglutils.cpp +++ b/src/voglutils.cpp @@ -783,7 +783,7 @@ void webby_update(std::vector *commands, struct timeval *timeoutval //---------------------------------------------------------------------------------------------------------------------- void webby_end() { - webby_data().ws_connections.empty(); + (void) webby_data().ws_connections.empty(); if (webby_data().server) { From 8eb0577ae5c8fbe473b8424855ee8d5f0f0af2f0 Mon Sep 17 00:00:00 2001 From: rilysh Date: Wed, 22 Mar 2023 21:33:58 +0530 Subject: [PATCH 2/2] use static_cast instead of deprecated casting method --- src/voglutils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/voglutils.cpp b/src/voglutils.cpp index 4b9ea99..26ec6d5 100644 --- a/src/voglutils.cpp +++ b/src/voglutils.cpp @@ -783,7 +783,7 @@ void webby_update(std::vector *commands, struct timeval *timeoutval //---------------------------------------------------------------------------------------------------------------------- void webby_end() { - (void) webby_data().ws_connections.empty(); + static_cast(webby_data().ws_connections.empty()); if (webby_data().server) {