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

wmc: 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-10-22 22:39:03 +02:00 committed by Alexandre Julliard
parent 9e365e4ecc
commit 86ebd6dc0d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/wmc/lang.c
View File

@ -162,14 +162,12 @@ static const language_t languages[] = {
{0x500A, 850, 1252, "Spanish", "Puerto Rico"} {0x500A, 850, 1252, "Spanish", "Puerto Rico"}
}; };
#define NLAN (sizeof(languages)/sizeof(languages[0]))
void show_languages(void) void show_languages(void)
{ {
unsigned int i; unsigned int i;
printf(" Code | DOS-cp | WIN-cp | Language | Country\n"); printf(" Code | DOS-cp | WIN-cp | Language | Country\n");
printf("-------+--------+--------+--------------+---------\n"); printf("-------+--------+--------+--------------+---------\n");
for(i = 0; i < NLAN; i++) for(i = 0; i < ARRAY_SIZE(languages); i++)
printf("0x%04x | %5d | %5d | %-12s | %s\n", printf("0x%04x | %5d | %5d | %-12s | %s\n",
languages[i].id, languages[i].id,
languages[i].doscp, languages[i].doscp,
@ -185,7 +183,8 @@ static int langcmp(const void *p1, const void *p2)
const language_t *find_language(unsigned id) const language_t *find_language(unsigned id)
{ {
return (const language_t *)bsearch(&id, languages, NLAN, sizeof(languages[0]), langcmp); return (const language_t *)bsearch(&id, languages, ARRAY_SIZE(languages),
sizeof(languages[0]), langcmp);
} }
void show_codepages(void) void show_codepages(void)

4
tools/wmc/po.c
View File

@ -666,10 +666,10 @@ void add_translations( const char *po_dir )
if ((p = strchr( buffer, '#' ))) *p = 0; if ((p = strchr( buffer, '#' ))) *p = 0;
for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" )) for (tok = strtok( buffer, " \t\r\n" ); tok; tok = strtok( NULL, " \t\r\n" ))
{ {
for (i = 0; i < sizeof(languages)/sizeof(languages[0]); i++) for (i = 0; i < ARRAY_SIZE(languages); i++)
if (!strcmp( tok, languages[i].name )) break; if (!strcmp( tok, languages[i].name )) break;
if (i == sizeof(languages)/sizeof(languages[0])) if (i == ARRAY_SIZE(languages))
error( "unknown language '%s'\n", tok ); error( "unknown language '%s'\n", tok );
name = strmake( "%s/%s.mo", po_dir, tok ); name = strmake( "%s/%s.mo", po_dir, tok );