aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-09-28 14:33:26 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-09-29 12:22:19 +0200
commit40901c54375065c28f402b09126e9e50f80e8dfa (patch)
tree7e56ae5233f6c55ca58897c99dd2e8b1ee3a265e
parent6aca100469838a030542283013589d99a002d10d (diff)
downloadpasst-40901c54375065c28f402b09126e9e50f80e8dfa.tar
passt-40901c54375065c28f402b09126e9e50f80e8dfa.tar.gz
passt-40901c54375065c28f402b09126e9e50f80e8dfa.tar.bz2
passt-40901c54375065c28f402b09126e9e50f80e8dfa.tar.lz
passt-40901c54375065c28f402b09126e9e50f80e8dfa.tar.xz
passt-40901c54375065c28f402b09126e9e50f80e8dfa.tar.zst
passt-40901c54375065c28f402b09126e9e50f80e8dfa.zip
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 <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
-rw-r--r--Makefile1
-rw-r--r--conf.c2
2 files changed, 2 insertions, 1 deletions
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++;