[PATCH v2] usbip: tools: usbipd: use ARRAY_SIZE for sockfdlist
From: Jiapeng Chong <hidden>
Date: 2021-06-11 10:15:46
Also in:
lkml
Subsystem:
the rest, usb over ip driver · Maintainers:
Linus Torvalds, Valentina Manea, Shuah Khan, Shuah Khan
Use ARRAY_SIZE instead of dividing sizeof array with sizeof an element. Clean up the following coccicheck warning: ./tools/usb/usbip/src/usbipd.c:536:19-20: WARNING: Use ARRAY_SIZE. Reported-by: Abaci Robot <redacted> Signed-off-by: Jiapeng Chong <redacted> --- Changes in v2: -Add ARRAY_SIZE definition to usbip_common.h file. tools/usb/usbip/libsrc/usbip_common.h | 2 ++ tools/usb/usbip/src/usbipd.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/usb/usbip/libsrc/usbip_common.h b/tools/usb/usbip/libsrc/usbip_common.h
index 73a367a..4e12dc4 100644
--- a/tools/usb/usbip/libsrc/usbip_common.h
+++ b/tools/usb/usbip/libsrc/usbip_common.h@@ -101,6 +101,8 @@ abort(); \ } while (0) +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + struct usbip_usb_interface { uint8_t bInterfaceClass; uint8_t bInterfaceSubClass;
diff --git a/tools/usb/usbip/src/usbipd.c b/tools/usb/usbip/src/usbipd.c
index 48398a7..4826d13 100644
--- a/tools/usb/usbip/src/usbipd.c
+++ b/tools/usb/usbip/src/usbipd.c@@ -532,8 +532,7 @@ static int do_standalone_mode(int daemonize, int ipv4, int ipv6) usbip_driver_close(driver); return -1; } - nsockfd = listen_all_addrinfo(ai_head, sockfdlist, - sizeof(sockfdlist) / sizeof(*sockfdlist)); + nsockfd = listen_all_addrinfo(ai_head, sockfdlist, ARRAY_SIZE(sockfdlist)); freeaddrinfo(ai_head); if (nsockfd <= 0) { err("failed to open a listening socket");
--
1.8.3.1