ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hostname: Use the ARRAY_SIZE() macro. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-07-24 00:01:25 +02:00 committed by Alexandre Julliard
parent b762bd7b17
commit d3188ce1f9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/hostname/hostname.c
View File

@ -90,8 +90,7 @@ static int hostname_message_printfW(int msg, ...)
WCHAR msg_buffer[8192]; WCHAR msg_buffer[8192];
int len; int len;
LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer));
sizeof(msg_buffer)/sizeof(WCHAR));
va_start(va_args, msg); va_start(va_args, msg);
len = hostname_vprintfW(msg_buffer, va_args); len = hostname_vprintfW(msg_buffer, va_args);
@ -105,8 +104,7 @@ static int hostname_message(int msg)
static const WCHAR formatW[] = {'%','s',0}; static const WCHAR formatW[] = {'%','s',0};
WCHAR msg_buffer[8192]; WCHAR msg_buffer[8192];
LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer));
sizeof(msg_buffer)/sizeof(WCHAR));
return hostname_printfW(formatW, msg_buffer); return hostname_printfW(formatW, msg_buffer);
} }
@ -119,7 +117,7 @@ static void display_computer_name(void)
WCHAR nameW[256]; WCHAR nameW[256];
gethostname(nameA, sizeof(nameA)); gethostname(nameA, sizeof(nameA));
MultiByteToWideChar(CP_UNIXCP, 0, nameA, sizeof(nameA), nameW, sizeof(nameW)/sizeof(WCHAR)); MultiByteToWideChar(CP_UNIXCP, 0, nameA, sizeof(nameA), nameW, ARRAY_SIZE(nameW));
hostname_printfW(fmtW, nameW); hostname_printfW(fmtW, nameW);
} }
@ -132,7 +130,7 @@ int wmain(int argc, WCHAR *argv[])
unsigned int i; unsigned int i;
if (!strncmpW(argv[1], slashHelpW, sizeof(slashHelpW)/sizeof(WCHAR) - 1)) if (!strncmpW(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1))
{ {
hostname_message(STRING_USAGE); hostname_message(STRING_USAGE);
return 1; return 1;