From a7123f0edfea20a68e64e447dc6ca0c32736be0e Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 1 Oct 1999 16:09:12 +0000
Subject: Update.

1999-10-01  Andreas Jaeger  <aj@suse.de>

	* locale/programs/ld-collate.c (insert_value): Add cast to avoid
	warning.
	* intl/finddomain.c (_nl_find_domain): Likewise.

1999-09-30  Andreas Schwab  <schwab@suse.de>

	* sysdeps/unix/sysv/linux/alpha/ioperm.c: Disable debug messages.

1999-09-30  Andreas Jaeger  <aj@suse.de>

	* sysdeps/i386/lshift.S: Correct assembler commands to fix warnings.
	* sysdeps/i386/rshift.S: Likewise.
	* sysdeps/i386/strchrnul.S: Likewise.
	* sysdeps/i386/strchr.S: Likewise.
	Patch by Michael Deutschmann <michael@talamasca.wkpowerlink.com>,
	PR libc/1339.

1999-09-30  Andreas Jaeger  <aj@suse.de>

	* manual/examples/pipe.c: Close other end of pipe to make example work.

1999-10-01  Ulrich Drepper  <drepper@cygnus.com>

	* timezone/checktab.awk: Update from tzcode1999g.
	* timezone/tzselect.ksh: Likewise.
	* timezone/africa: Update from tzdata1999g.
	* timezone/asia: Likewise.
	* timezone/australasia: Likewise.
	* timezone/europe: Likewise.
	* timezone/northamerica: Likewise.
	* timezone/southamerica: Likewise.
	* timezone/iso3166.tab: Likewise.
	* timezone/zone.tab: Likewise.

	been renamed to getipnodebyname.  Move flags around.
---
 timezone/checktab.awk | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'timezone/checktab.awk')

diff --git a/timezone/checktab.awk b/timezone/checktab.awk
index 9006e9f..43ecc92 100644
--- a/timezone/checktab.awk
+++ b/timezone/checktab.awk
@@ -1,5 +1,7 @@
 # Check tz tables for consistency.
 
+# @(#)checktab.awk	1.5
+
 # Contributed by Paul Eggert <eggert@twinsun.com>.
 
 BEGIN {
@@ -13,7 +15,7 @@ BEGIN {
 		iso_NR++
 		if ($0 ~ /^#/) continue
 		if (NF != 2) {
-			printf "%s:%d: wrong number of columns\n",
+			printf "%s:%d: wrong number of columns\n", \
 				iso_table, iso_NR >>"/dev/stderr"
 			status = 1
 		}
@@ -25,9 +27,14 @@ BEGIN {
 			status = 1
 		}
 		if (cc <= cc0) {
+			if (cc == cc0) {
+				s = "duplicate";
+			} else {
+				s = "out of order";
+			}
+
 			printf "%s:%d: country code `%s' is %s\n", \
-				iso_table, iso_NR, cc, \
-				cc==cc0 ? "duplicate"  : "out of order" \
+				iso_table, iso_NR, cc, s \
 				>>"/dev/stderr"
 			status = 1
 		}
@@ -50,7 +57,7 @@ BEGIN {
 		zone_NR++
 		if ($0 ~ /^#/) continue
 		if (NF != 3 && NF != 4) {
-			printf "%s:%d: wrong number of columns\n",
+			printf "%s:%d: wrong number of columns\n", \
 				zone_table, zone_NR >>"/dev/stderr"
 			status = 1
 		}
@@ -142,7 +149,7 @@ END {
 		for (cc in cc2name) {
 			if (!cc_used[cc]) {
 				printf "%s:%d: warning:" \
-					"no Zone entries for %s (%s)\n",
+					"no Zone entries for %s (%s)\n", \
 					iso_table, cc2NR[cc], cc, cc2name[cc]
 			}
 		}
-- 
cgit v1.1