d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

At the end it was much simpler than I thought. 26 * 26 = 676 and not 576.

Browse Source 
South Africa and a few other countries exists again. This fix pr 2595.
This should go into 2.2.
This commit is contained in:
John Hay 1997-02-01 17:03:10 +00:00
parent d1adf9f099
commit 3e70cf1f94
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/tzsetup/tzsetup.c
View File

@ -159,7 +159,8 @@ struct zone {
* of the two-letter variety, so we just size this array to suit.
* Beats worrying about dynamic allocation.
*/
static struct country countries[26*26];
#define NCOUNTRIES (26*26)
static struct country countries[NCOUNTRIES];
#define CODE2INT(s) ((s[0] - 'A') * 26 + (s[1] - 'A'))
/*
@ -291,7 +292,7 @@ compare_countries(const void *xa, const void *xb)
static void
sort_countries(void)
{
qsort(countries, 576, sizeof countries[0], compare_countries);
qsort(countries, NCOUNTRIES, sizeof countries[0], compare_countries);
}
static void