From 47a7397766e88d24f3aad16d9ca2b77233f4ebca Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 29 Sep 2017 09:58:22 +0200 Subject: [PATCH] =?utf8?q?tree-wide:=20use=20`!IN=5FSET(..)`=20for=20`a=20?= =?utf8?q?!=3D=20b=20&&=20a=20!=3D=20c=20&&=20=E2=80=A6`?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The included cocci was used to generate the changes. Thanks to @flo-wer for pointing this case out. --- coccinelle/not_in_set.cocci | 147 ++++++++++++++++++++++++++++++++++++ src/basic/rm-rf.c | 2 +- src/basic/socket-util.c | 10 +-- src/login/logind-user.c | 2 +- 4 files changed, 154 insertions(+), 7 deletions(-) create mode 100644 coccinelle/not_in_set.cocci diff --git a/coccinelle/not_in_set.cocci b/coccinelle/not_in_set.cocci new file mode 100644 index 000000000..e6bcf4789 --- /dev/null +++ b/coccinelle/not_in_set.cocci @@ -0,0 +1,147 @@ +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19, n20; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 && e != n18 && e != n19 && e != n20 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19, n20) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 && e != n18 && e != n19 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 && e != n18 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 && e != n17 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 && e != n16 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 && e != n15 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 && e != n14 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 && e != n13 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 && e != n12 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 && e != n11 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 && e != n10 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8, n9; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 && e != n9 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8, n9) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7, n8; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 && e != n8 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7, n8) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6, n7; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 && e != n7 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6, n7) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5, n6; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 && e != n6 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5, n6) +@@ +expression e; +identifier n0, n1, n2, n3, n4, n5; +statement s; +@@ +- e != n0 && e != n1 && e != n2 && e != n3 && e != n4 && e != n5 ++ !IN_SET(e, n0, n1, n2, n3, n4, n5) +@@ +expression e; +identifier n1, n2, n3, n4, n5; +statement s; +@@ +- e != n1 && e != n2 && e != n3 && e != n4 && e != n5 ++ !IN_SET(e, n1, n2, n3, n4, n5) +@@ +expression e; +identifier n1, n2, n3, n4; +statement s; +@@ +- e != n1 && e != n2 && e != n3 && e != n4 ++ !IN_SET(e, n1, n2, n3, n4) +@@ +expression e; +identifier n1, n2, n3, n4; +statement s; +@@ +- e != n1 && e != n2 && e != n3 && e != n4 ++ !IN_SET(e, n1, n2, n3, n4) +@@ +expression e; +identifier n1, n2, n3; +statement s; +@@ +- e != n1 && e != n2 && e != n3 ++ !IN_SET(e, n1, n2, n3) +@@ +expression e; +identifier n, p; +statement s; +@@ +- e != n && e != p ++ !IN_SET(e, n, p) diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c index 156366c7d..fea9242be 100644 --- a/src/basic/rm-rf.c +++ b/src/basic/rm-rf.c @@ -206,7 +206,7 @@ int rm_rf(const char *path, RemoveFlags flags) { fd = open(path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); if (fd < 0) { - if (errno != ENOTDIR && errno != ELOOP) + if (!IN_SET(errno, ENOTDIR, ELOOP)) return -errno; if (!(flags & REMOVE_PHYSICAL)) { diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index c32b8d3e1..fec5ee12e 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -268,7 +268,7 @@ int socket_address_verify(const SocketAddress *a) { if (a->sockaddr.in.sin_port == 0) return -EINVAL; - if (a->type != SOCK_STREAM && a->type != SOCK_DGRAM) + if (!IN_SET(a->type, SOCK_STREAM, SOCK_DGRAM)) return -EINVAL; return 0; @@ -280,7 +280,7 @@ int socket_address_verify(const SocketAddress *a) { if (a->sockaddr.in6.sin6_port == 0) return -EINVAL; - if (a->type != SOCK_STREAM && a->type != SOCK_DGRAM) + if (!IN_SET(a->type, SOCK_STREAM, SOCK_DGRAM)) return -EINVAL; return 0; @@ -304,7 +304,7 @@ int socket_address_verify(const SocketAddress *a) { } } - if (a->type != SOCK_STREAM && a->type != SOCK_DGRAM && a->type != SOCK_SEQPACKET) + if (!IN_SET(a->type, SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET)) return -EINVAL; return 0; @@ -314,7 +314,7 @@ int socket_address_verify(const SocketAddress *a) { if (a->size != sizeof(struct sockaddr_nl)) return -EINVAL; - if (a->type != SOCK_RAW && a->type != SOCK_DGRAM) + if (!IN_SET(a->type, SOCK_RAW, SOCK_DGRAM)) return -EINVAL; return 0; @@ -323,7 +323,7 @@ int socket_address_verify(const SocketAddress *a) { if (a->size != sizeof(struct sockaddr_vm)) return -EINVAL; - if (a->type != SOCK_STREAM && a->type != SOCK_DGRAM) + if (!IN_SET(a->type, SOCK_STREAM, SOCK_DGRAM)) return -EINVAL; return 0; diff --git a/src/login/logind-user.c b/src/login/logind-user.c index cd460d365..485be84f6 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -363,7 +363,7 @@ static int user_mkdir_runtime_path(User *u) { r = mount("tmpfs", u->runtime_path, "tmpfs", MS_NODEV|MS_NOSUID, t); if (r < 0) { - if (errno != EPERM && errno != EACCES) { + if (!IN_SET(errno, EPERM, EACCES)) { r = log_error_errno(errno, "Failed to mount per-user tmpfs directory %s: %m", u->runtime_path); goto fail; } -- 2.30.2