From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpDTM-0007FI-W0 for qemu-devel@nongnu.org; Sat, 07 Dec 2013 03:42:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VpDTM-0004En-1R for qemu-devel@nongnu.org; Sat, 07 Dec 2013 03:42:48 -0500 From: Stefan Weil Date: Sat, 7 Dec 2013 09:42:44 +0100 Message-Id: <1386405764-18118-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH] misc: Use macro ARRAY_SIZE were possible List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: qemu-trivial@nongnu.org, Stefan Weil , Stefan Hajnoczi , Gerd Hoffmann , Anthony Liguori This improves readability and simplifies the code. Signed-off-by: Stefan Weil --- hw/audio/intel-hda.c | 4 ++-- net/net.c | 2 +- qemu-char.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 4327264..8fe5d87 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -899,7 +899,7 @@ static const IntelHDAReg *intel_hda_reg_find(IntelHDAState *d, hwaddr addr) { const IntelHDAReg *reg; - if (addr >= sizeof(regtab)/sizeof(regtab[0])) { + if (addr >= ARRAY_SIZE(regtab)) { goto noreg; } reg = regtab+addr; @@ -1024,7 +1024,7 @@ static void intel_hda_regs_reset(IntelHDAState *d) uint32_t *addr; int i; - for (i = 0; i < sizeof(regtab)/sizeof(regtab[0]); i++) { + for (i = 0; i < ARRAY_SIZE(regtab); i++) { if (regtab[i].name == NULL) { continue; } diff --git a/net/net.c b/net/net.c index 0a88e68..d677606 100644 --- a/net/net.c +++ b/net/net.c @@ -850,7 +850,7 @@ static int net_host_check_device(const char *device) ,"vde" #endif }; - for (i = 0; i < sizeof(valid_param_list) / sizeof(char *); i++) { + for (i = 0; i < ARRAY_SIZE(valid_param_list); i++) { if (!strncmp(valid_param_list[i], device, strlen(valid_param_list[i]))) return 1; diff --git a/qemu-char.c b/qemu-char.c index e00f84c..362a02d 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -1975,8 +1975,7 @@ static void win_stdio_wait_func(void *opaque) DWORD dwSize; int i; - ret = ReadConsoleInput(stdio->hStdIn, buf, sizeof(buf) / sizeof(*buf), - &dwSize); + ret = ReadConsoleInput(stdio->hStdIn, buf, ARRAY_SIZE(buf), &dwSize); if (!ret) { /* Avoid error storm */ -- 1.7.10.4