提交 dff7424d 编写于 作者: S Stefan Weil 提交者: Michael Tokarev

misc: Use macro ARRAY_SIZE where possible

This improves readability and simplifies the code.

Cc: Anthony Liguori <aliguori@amazon.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: NStefan Weil <sw@weilnetz.de>
Reviewed-by: NPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
上级 2e0fc3a4
...@@ -900,7 +900,7 @@ static const IntelHDAReg *intel_hda_reg_find(IntelHDAState *d, hwaddr addr) ...@@ -900,7 +900,7 @@ static const IntelHDAReg *intel_hda_reg_find(IntelHDAState *d, hwaddr addr)
{ {
const IntelHDAReg *reg; const IntelHDAReg *reg;
if (addr >= sizeof(regtab)/sizeof(regtab[0])) { if (addr >= ARRAY_SIZE(regtab)) {
goto noreg; goto noreg;
} }
reg = regtab+addr; reg = regtab+addr;
...@@ -1025,7 +1025,7 @@ static void intel_hda_regs_reset(IntelHDAState *d) ...@@ -1025,7 +1025,7 @@ static void intel_hda_regs_reset(IntelHDAState *d)
uint32_t *addr; uint32_t *addr;
int i; 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) { if (regtab[i].name == NULL) {
continue; continue;
} }
......
...@@ -856,7 +856,7 @@ static int net_host_check_device(const char *device) ...@@ -856,7 +856,7 @@ static int net_host_check_device(const char *device)
,"vde" ,"vde"
#endif #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, if (!strncmp(valid_param_list[i], device,
strlen(valid_param_list[i]))) strlen(valid_param_list[i])))
return 1; return 1;
......
...@@ -1975,8 +1975,7 @@ static void win_stdio_wait_func(void *opaque) ...@@ -1975,8 +1975,7 @@ static void win_stdio_wait_func(void *opaque)
DWORD dwSize; DWORD dwSize;
int i; int i;
ret = ReadConsoleInput(stdio->hStdIn, buf, sizeof(buf) / sizeof(*buf), ret = ReadConsoleInput(stdio->hStdIn, buf, ARRAY_SIZE(buf), &dwSize);
&dwSize);
if (!ret) { if (!ret) {
/* Avoid error storm */ /* Avoid error storm */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册