mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cppcheck: Use inline suppressions for qrap.c

Browse source 
qrap.c uses several old-fashioned functions that cppcheck complains about.
Since it's headed for obselesence anyway, just suppress these rather than
attempting to modernize the code.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2022-09-28 14:33:25 +10:00 committed by Stefano Brivio
parent fb15259205
commit 6aca100469
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -287,7 +287,7 @@ cppcheck: $(SRCS) $(HEADERS)
--suppress=va_list_usedBeforeStarted:util.c \ --suppress=va_list_usedBeforeStarted:util.c \
--suppress=unusedFunction \ --suppress=unusedFunction \
--suppress=knownConditionTrueFalse:conf.c \ --suppress=knownConditionTrueFalse:conf.c \
--suppress=strtokCalled:conf.c --suppress=strtokCalled:qrap.c \ --suppress=strtokCalled:conf.c \
--suppress=localtimeCalled:pcap.c \ --suppress=localtimeCalled:pcap.c \
--suppress=unusedStructMember:pcap.c \ --suppress=unusedStructMember:pcap.c \
--suppress=unusedStructMember:dhcp.c \ --suppress=unusedStructMember:dhcp.c \
@ -295,7 +295,6 @@ cppcheck: $(SRCS) $(HEADERS)
--suppress=unmatchedSuppression:conf.c \ --suppress=unmatchedSuppression:conf.c \
--suppress=unmatchedSuppression:dhcp.c \ --suppress=unmatchedSuppression:dhcp.c \
--suppress=unmatchedSuppression:pcap.c \ --suppress=unmatchedSuppression:pcap.c \
--suppress=unmatchedSuppression:qrap.c \
--suppress=unmatchedSuppression:tcp.c \ --suppress=unmatchedSuppression:tcp.c \
--suppress=unmatchedSuppression:udp.c \ --suppress=unmatchedSuppression:udp.c \
--suppress=unmatchedSuppression:util.c \ --suppress=unmatchedSuppression:util.c \

3
qrap.c
View file

@ -179,12 +179,14 @@ int main(int argc, char **argv)
char env_path[ARG_MAX + 1], *p, command[ARG_MAX]; char env_path[ARG_MAX + 1], *p, command[ARG_MAX];
strncpy(env_path, getenv("PATH"), ARG_MAX); strncpy(env_path, getenv("PATH"), ARG_MAX);
/* cppcheck-suppress strtokCalled */
p = strtok(env_path, ":"); p = strtok(env_path, ":");
while (p) { while (p) {
snprintf(command, ARG_MAX, "%s/%s", p, argv[2]); snprintf(command, ARG_MAX, "%s/%s", p, argv[2]);
if (!access(command, X_OK)) if (!access(command, X_OK))
goto valid_args; goto valid_args;
/* cppcheck-suppress strtokCalled */
p = strtok(NULL, ":"); p = strtok(NULL, ":");
} }
} }
@ -317,6 +319,7 @@ retry:
*/ */
if (retry_on_reset && rc == ECONNRESET) { if (retry_on_reset && rc == ECONNRESET) {
retry_on_reset--; retry_on_reset--;
/* cppcheck-suppress usleepCalled */
usleep(50 * 1000); usleep(50 * 1000);
goto retry; goto retry;
} }