aboutgitcodebugslistschat
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2023-03-21 14:54:59 +1100
committerStefano Brivio <sbrivio@redhat.com>2023-03-21 16:38:06 +0100
commit34ade90957ddc5086cc17dc1af47ca640aa650e5 (patch)
tree7ab3ade484f8eda80873d0d75daa9231c5c25d23
parentccf6d2a7b48d08c23c16a618d5f8e148c3fc84de (diff)
downloadpasst-34ade90957ddc5086cc17dc1af47ca640aa650e5.tar
passt-34ade90957ddc5086cc17dc1af47ca640aa650e5.tar.gz
passt-34ade90957ddc5086cc17dc1af47ca640aa650e5.tar.bz2
passt-34ade90957ddc5086cc17dc1af47ca640aa650e5.tar.lz
passt-34ade90957ddc5086cc17dc1af47ca640aa650e5.tar.xz
passt-34ade90957ddc5086cc17dc1af47ca640aa650e5.tar.zst
passt-34ade90957ddc5086cc17dc1af47ca640aa650e5.zip
Work around weird false positives with cppcheck-2.9.1
Commit 89e38f55 "treewide: Fix header includes to build with musl" added extra #includes to work with musl. Unfortunately with the cppcheck version I'm using (cppcheck-2.9-1.fc37.x86_64 in Fedora 37) this causes weird false positives: specifically cppcheck seems to hit a #error in <bits/unistd.h> complaining about including it directly instead of via <unistd.h> (which is not something we're doing). I have no idea why that would be happening; but I'm guessing it has to be a bug in the cpp implementation in that cppcheck version. In any case, it's possible to work around this by moving the include of <unistd.h> before the include of <signal.h>. So, do that. Fixes: 89e38f55405d ("treewide: Fix header includes to build with musl") Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
-rw-r--r--conf.c2
-rw-r--r--netlink.c2
-rw-r--r--tap.c2
-rw-r--r--tcp.c2
-rw-r--r--tcp_splice.c2
-rw-r--r--udp.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/conf.c b/conf.c
index ce60432..04e9956 100644
--- a/conf.c
+++ b/conf.c
@@ -23,12 +23,12 @@
#include <limits.h>
#include <grp.h>
#include <pwd.h>
+#include <unistd.h>
#include <signal.h>
#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
#include <stdbool.h>
-#include <unistd.h>
#include <syslog.h>
#include <time.h>
#include <netinet/in.h>
diff --git a/netlink.c b/netlink.c
index c8d39a1..00aa3e9 100644
--- a/netlink.c
+++ b/netlink.c
@@ -18,11 +18,11 @@
#include <errno.h>
#include <sys/types.h>
#include <limits.h>
+#include <unistd.h>
#include <signal.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdint.h>
-#include <unistd.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <netinet/if_ether.h>
diff --git a/tap.c b/tap.c
index 15fb52e..68ef480 100644
--- a/tap.c
+++ b/tap.c
@@ -14,6 +14,7 @@
*/
#include <sched.h>
+#include <unistd.h>
#include <signal.h>
#include <stdio.h>
#include <errno.h>
@@ -33,7 +34,6 @@
#include <sys/uio.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <unistd.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
diff --git a/tcp.c b/tcp.c
index 0d0ad13..3bfcb1c 100644
--- a/tcp.c
+++ b/tcp.c
@@ -267,6 +267,7 @@
#include <sched.h>
#include <fcntl.h>
#include <stdio.h>
+#include <unistd.h>
#include <signal.h>
#include <stdlib.h>
#include <errno.h>
@@ -287,7 +288,6 @@
#include <sys/timerfd.h>
#include <sys/types.h>
#include <sys/uio.h>
-#include <unistd.h>
#include <time.h>
#include <linux/tcp.h> /* For struct tcp_info */
diff --git a/tcp_splice.c b/tcp_splice.c
index 6559762..5bfad2a 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -32,6 +32,7 @@
*/
#include <sched.h>
+#include <unistd.h>
#include <signal.h>
#include <errno.h>
#include <fcntl.h>
@@ -40,7 +41,6 @@
#include <stdbool.h>
#include <string.h>
#include <time.h>
-#include <unistd.h>
#include <net/ethernet.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
diff --git a/udp.c b/udp.c
index 45c8d40..ddf01db 100644
--- a/udp.c
+++ b/udp.c
@@ -91,6 +91,7 @@
*/
#include <sched.h>
+#include <unistd.h>
#include <signal.h>
#include <stdio.h>
#include <errno.h>
@@ -107,7 +108,6 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/uio.h>
-#include <unistd.h>
#include <time.h>
#include "checksum.h"