fixes coccinelle WARNING: Use ARRAY_SIZE Signed-off-by: Mahmoud Maatuq mahmoudmatook.mm@gmail.com --- tools/testing/selftests/net/csum.c | 8 ++++++-- tools/testing/selftests/net/hwtstamp_config.c | 18 ++++++++++-------- tools/testing/selftests/net/psock_lib.h | 6 +++++- 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/net/csum.c b/tools/testing/selftests/net/csum.c index 82a1c1839da6..702f34a9d506 100644 --- a/tools/testing/selftests/net/csum.c +++ b/tools/testing/selftests/net/csum.c @@ -123,6 +123,10 @@ static struct sockaddr_in6 cfg_saddr6 = {.sin6_family = AF_INET6}; #define MAX_HEADER_LEN (sizeof(struct ipv6hdr) + ENC_HEADER_LEN + sizeof(struct tcphdr)) #define MAX_PAYLOAD_LEN 1024

+#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif + /* Trivial demo encap. Stand-in for transport layer protocols like ESP or PSP */ struct udp_encap_hdr { uint8_t nexthdr; @@ -450,7 +454,7 @@ static void send_packet(int fd, const char *buf, int len) iov[2].iov_len = len;

msg.msg_iov = iov; - msg.msg_iovlen = sizeof(iov) / sizeof(iov[0]); + msg.msg_iovlen = ARRAY_SIZE(iov);

msg.msg_name = &addr; msg.msg_namelen = sizeof(addr); @@ -505,7 +509,7 @@ static void __recv_prepare_packet_filter(int fd, int off_nexthdr, int off_dport) struct sock_fprog prog = {};

prog.filter = filter; - prog.len = sizeof(filter) / sizeof(struct sock_filter); + prog.len = ARRAY_SIZE(filter); if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog))) error(1, errno, "setsockopt filter"); } diff --git a/tools/testing/selftests/net/hwtstamp_config.c b/tools/testing/selftests/net/hwtstamp_config.c index e1fdee841021..263cc1c34165 100644 --- a/tools/testing/selftests/net/hwtstamp_config.c +++ b/tools/testing/selftests/net/hwtstamp_config.c @@ -16,6 +16,10 @@ #include <linux/net_tstamp.h> #include <linux/sockios.h>

+#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif + static int lookup_value(const char **names, int size, const char *name) { @@ -50,7 +54,6 @@ static const char *tx_types[] = { TX_TYPE(ONESTEP_SYNC) #undef TX_TYPE }; -#define N_TX_TYPES ((int)(sizeof(tx_types) / sizeof(tx_types[0])))

static const char *rx_filters[] = { #define RX_FILTER(name) [HWTSTAMP_FILTER_ ## name] = #name @@ -71,16 +74,15 @@ static const char *rx_filters[] = { RX_FILTER(PTP_V2_DELAY_REQ), #undef RX_FILTER }; -#define N_RX_FILTERS ((int)(sizeof(rx_filters) / sizeof(rx_filters[0])))

static void usage(void) { fputs("Usage: hwtstamp_config if_name [tx_type rx_filter]\n" "tx_type is any of (case-insensitive):\n", stderr); - list_names(stderr, tx_types, N_TX_TYPES); + list_names(stderr, tx_types, ARRAY_SIZE(tx_types)); fputs("rx_filter is any of (case-insensitive):\n", stderr); - list_names(stderr, rx_filters, N_RX_FILTERS); + list_names(stderr, rx_filters, ARRAY_SIZE(rx_filters)); }

int main(int argc, char **argv) @@ -97,8 +99,8 @@ int main(int argc, char **argv)

if (argc == 4) { config.flags = 0; - config.tx_type = lookup_value(tx_types, N_TX_TYPES, argv[2]); - config.rx_filter = lookup_value(rx_filters, N_RX_FILTERS, argv[3]); + config.tx_type = lookup_value(tx_types, ARRAY_SIZE(tx_types), argv[2]); + config.rx_filter = lookup_value(rx_filters, ARRAY_SIZE(rx_filters), argv[3]); if (config.tx_type < 0 || config.rx_filter < 0) { usage(); return 2; @@ -120,12 +122,12 @@ int main(int argc, char **argv) }

printf("flags = %#x\n", config.flags); - name = lookup_name(tx_types, N_TX_TYPES, config.tx_type); + name = lookup_name(tx_types, ARRAY_SIZE(tx_types), config.tx_type); if (name) printf("tx_type = %s\n", name); else printf("tx_type = %d\n", config.tx_type); - name = lookup_name(rx_filters, N_RX_FILTERS, config.rx_filter); + name = lookup_name(rx_filters, ARRAY_SIZE(rx_filters), config.rx_filter); if (name) printf("rx_filter = %s\n", name); else diff --git a/tools/testing/selftests/net/psock_lib.h b/tools/testing/selftests/net/psock_lib.h index faa884385c45..72078d46864d 100644 --- a/tools/testing/selftests/net/psock_lib.h +++ b/tools/testing/selftests/net/psock_lib.h @@ -24,6 +24,10 @@ # define __maybe_unused __attribute__ ((__unused__)) #endif

+#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif + static __maybe_unused void pair_udp_setfilter(int fd) { /* the filter below checks for all of the following conditions that @@ -63,7 +67,7 @@ static __maybe_unused void pair_udp_setfilter(int fd) struct sock_fprog bpf_prog;

bpf_prog.filter = bpf_filter; - bpf_prog.len = sizeof(bpf_filter) / sizeof(struct sock_filter); + bpf_prog.len = ARRAY_SIZE(bpf_filter);

if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &bpf_prog, sizeof(bpf_prog))) {