From 40901c54375065c28f402b09126e9e50f80e8dfa Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 28 Sep 2022 14:33:26 +1000 Subject: [PATCH] cppcheck: Use inline suppression for strtok() in conf.c 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 Signed-off-by: Stefano Brivio --- 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 3fbd308..1537dbf 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++;