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>
This commit is contained in:
parent
6aca100469
commit
40901c5437
2 changed files with 2 additions and 1 deletions
1
Makefile
1
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 \
|
||||
|
|
2
conf.c
2
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++;
|
||||
|
|
Loading…
Reference in a new issue