From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson To: passt-dev@passt.top Subject: [PATCH v2 15/28] cppcheck: Use inline suppression for strtok() in conf.c Date: Thu, 29 Sep 2022 13:38:19 +1000 Message-ID: <20220929033832.923149-16-david@gibson.dropbear.id.au> In-Reply-To: <20220929033832.923149-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3294842490266406070==" --===============3294842490266406070== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit strtok() is non-reentrant and old-fashioned, so cppcheck would complains about its use in conf.c if it weren't suppressed. We're single threaded and strtok() is convenient though, so it's not really worth reworking at this time. Convert this to an inline suppression so it's adjacent to the code its annotating. Signed-off-by: David Gibson --- Makefile | 1 - conf.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d465d87..7c0b7e9 100644 --- a/Makefile +++ b/Makefile @@ -287,7 +287,6 @@ cppcheck: $(SRCS) $(HEADERS) --suppress=va_list_usedBeforeStarted:util.c \ --suppress=unusedFunction \ --suppress=knownConditionTrueFalse:conf.c \ - --suppress=strtokCalled:conf.c \ --suppress=localtimeCalled:pcap.c \ --suppress=unusedStructMember:pcap.c \ --suppress=unusedStructMember:dhcp.c \ diff --git a/conf.c b/conf.c index 2581730..7545b34 100644 --- a/conf.c +++ b/conf.c @@ -410,10 +410,12 @@ static void get_dns(struct ctx *c) if (end) *end = 0; + /* cppcheck-suppress strtokCalled */ if (!strtok(line, " \t")) continue; while (s - c->dns_search < ARRAY_SIZE(c->dns_search) - 1 + /* cppcheck-suppress strtokCalled */ && (p = strtok(NULL, " \t"))) { strncpy(s->n, p, sizeof(c->dns_search[0])); s++; -- 2.37.3 --===============3294842490266406070==--