From 8bf90bf3e7a821dbd3b7029d87aa592eec6f1754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= Date: Thu, 25 Jan 2018 12:00:18 +0100 Subject: [PATCH] Add fallthrough tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC 7 emits a warning when the tag /*@fallthrough@*/ doesn't appear in a switch case when a case continue to the next after some processing. Change-Id: I420e3788a4c0a6d910a1214964c5480bbd12708c Signed-off-by: José Bollo --- src/admin/api/admin-api.cpp | 1 + src/client-async/logic/Logic.cpp | 1 + src/common/sockets/SocketClient.cpp | 1 + 3 files changed, 3 insertions(+) diff --git a/src/admin/api/admin-api.cpp b/src/admin/api/admin-api.cpp index c638f41..aafa45e 100644 --- a/src/admin/api/admin-api.cpp +++ b/src/admin/api/admin-api.cpp @@ -146,6 +146,7 @@ int cynara_admin_set_policies(struct cynara_admin *p_cynara_admin, case CYNARA_ADMIN_BUCKET: if (!isStringValid(policy->result_extra)) return CYNARA_API_INVALID_PARAM; + /*@fallthrough@*/ default: { std::string extraStr = policy->result_extra ? policy->result_extra : ""; diff --git a/src/client-async/logic/Logic.cpp b/src/client-async/logic/Logic.cpp index 5ae0251..c1d6c33 100644 --- a/src/client-async/logic/Logic.cpp +++ b/src/client-async/logic/Logic.cpp @@ -233,6 +233,7 @@ bool Logic::processOut(void) { case Socket::SendStatus::ALL_DATA_SENT: onStatusChange(m_socketClient.getSockFd(), cynara_async_status::CYNARA_STATUS_FOR_READ); + /*@fallthrough@*/ case Socket::SendStatus::PARTIAL_DATA_SENT: return true; default: diff --git a/src/common/sockets/SocketClient.cpp b/src/common/sockets/SocketClient.cpp index b1ca4f7..f4394e5 100644 --- a/src/common/sockets/SocketClient.cpp +++ b/src/common/sockets/SocketClient.cpp @@ -45,6 +45,7 @@ bool SocketClient::connect(void) { LOGW("Error connecting to Cynara. Service not available."); return false; } + /*@fallthrough@*/ default: return true; }