[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/5] misc: Use macro ARRAY_SIZE where possible
From: |
Stefan Weil |
Subject: |
[Qemu-devel] [PATCH v2 1/5] misc: Use macro ARRAY_SIZE where possible |
Date: |
Sat, 7 Dec 2013 14:48:04 +0100 |
This improves readability and simplifies the code.
Cc: Anthony Liguori <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Weil <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 0/5] Replace sizeof(array) / sizeof(*array), Stefan Weil, 2013/12/07
- [Qemu-devel] [PATCH v2 2/5] ui/cocoa: Use macro A RRAY_SIZE where possible, Stefan Weil, 2013/12/07
- [Qemu-devel] [PATCH v2 1/5] misc: Use macro ARRAY_SIZE where possible,
Stefan Weil <=
- [Qemu-devel] [PATCH v2 5/5] linux-user: Use macro TARGET_NSIG_WORDS where possible, Stefan Weil, 2013/12/07
- [Qemu-devel] [PATCH v2 3/5] exynos4210: Use macro ARRAY_SIZE where possible, Stefan Weil, 2013/12/07
- [Qemu-devel] [PATCH v2 4/5] target-mips: Use macro ARRAY_SIZE where possible, Stefan Weil, 2013/12/07
- Re: [Qemu-devel] [PATCH v2 0/5] Replace sizeof(array) / sizeof(*array), Peter Maydell, 2013/12/07
- Re: [Qemu-devel] [Qemu-trivial] [PATCH v2 0/5] Replace sizeof(array) / sizeof(*array), Michael Tokarev, 2013/12/07