[PATCH] taskkill: Use the ARRAY_SIZE() macro
Michael Stefaniuc
mstefani at winehq.org
Mon Jul 23 17:01:28 CDT 2018
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
programs/taskkill/taskkill.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c
index 6e4e1eb55a..59ce98dc6d 100644
--- a/programs/taskkill/taskkill.c
+++ b/programs/taskkill/taskkill.c
@@ -47,7 +47,7 @@ static int taskkill_vprintfW(const WCHAR *msg, __ms_va_list va_args)
WCHAR msg_buffer[8192];
wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer,
- sizeof(msg_buffer)/sizeof(*msg_buffer), &va_args);
+ ARRAY_SIZE(msg_buffer), &va_args);
ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL);
if (!ret)
@@ -92,8 +92,7 @@ static int WINAPIV taskkill_message_printfW(int msg, ...)
WCHAR msg_buffer[8192];
int len;
- LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer,
- sizeof(msg_buffer)/sizeof(WCHAR));
+ LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer));
__ms_va_start(va_args, msg);
len = taskkill_vprintfW(msg_buffer, va_args);
@@ -107,8 +106,7 @@ static int taskkill_message(int msg)
static const WCHAR formatW[] = {'%','1',0};
WCHAR msg_buffer[8192];
- LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer,
- sizeof(msg_buffer)/sizeof(WCHAR));
+ LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer));
return taskkill_printfW(formatW, msg_buffer);
}
--
2.14.4
More information about the wine-devel
mailing list