From patchwork Sat Dec 7 08:42:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 298635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A1CB62C00AD for ; Sat, 7 Dec 2013 19:43:06 +1100 (EST) Received: from localhost ([::1]:35008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpDTb-0007FW-Fi for incoming@patchwork.ozlabs.org; Sat, 07 Dec 2013 03:43:03 -0500 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 Received: from qemu.weilnetz.de ([2a03:4000:2:362::1]:52887 helo=v2201305906712890.yourvserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VpDTL-0004Ej-R1; Sat, 07 Dec 2013 03:42:47 -0500 Received: by v2201305906712890.yourvserver.net (Postfix, from userid 1000) id 535AA1802AD; Sat, 7 Dec 2013 09:42:44 +0100 (CET) From: Stefan Weil To: qemu-devel Date: Sat, 7 Dec 2013 09:42:44 +0100 Message-Id: <1386405764-18118-1-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a03:4000:2:362::1 Cc: qemu-trivial@nongnu.org, Stefan Weil , Stefan Hajnoczi , Gerd Hoffmann , Anthony Liguori Subject: [Qemu-devel] [PATCH] misc: Use macro ARRAY_SIZE were possible X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 */