about summary refs log tree commit diff
path: root/locale/programs/ld-collate.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-23 22:17:17 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-23 22:17:17 +0000
commit4caef86ca68a3fea8fab5398bedc5e0e6c0d222b (patch)
tree4ed5e6e23fb6d99df8761dc425adbb91405915fb /locale/programs/ld-collate.c
parent8831788577cda2e19e27e6f1a793339abb9711fa (diff)
downloadglibc-4caef86ca68a3fea8fab5398bedc5e0e6c0d222b.tar.gz
glibc-4caef86ca68a3fea8fab5398bedc5e0e6c0d222b.tar.xz
glibc-4caef86ca68a3fea8fab5398bedc5e0e6c0d222b.zip
Update.
1999-01-23  Ulrich Drepper  <drepper@cygnus.com>

	* nss/nss_files/files-XXX.c (internal_getent): Make sure the buffer has
	at least two bytes (not one).  Correct buflen parameter type.
	* nss/nss_files/files-alias.c (get_next_alias): Make sure buffer
	has at least two bytes.  Use fgets_unlocked instead of fgets.

	* ctype/ctype.h: Don't user __tolower directly for tolower
	implementation.  Use inline function which tests for the range
	first.  Make _tolower equivalent to old tolower macros.
	Likewise for toupper.
	* ctype/ctype.c: Change tolower/toupper definition accordingly.

	* argp/argp-help.c: Use _tolower instead of tolower if possible.
	* inet/ether_aton_r.c: Likewise.
	* inet/ether_line.c: Likewise.
	* inet/rcmd.c: Likewise.
	* intl/l10nflist.c: Likewise.
	* locale/programs/ld-collate.c: Likewise.
	* locale/programs/linereader.c: Likewise.
	* locale/programs/localedef.c: Likewise.
	* nis/nss_nis/nis-alias.c: Likewise.
	* nis/nss_nis/nis-network.c: Likewise.
	* posix/regex.c: Likewise.
	* resolv/inet_net_pton.c: Likewise.
	* stdio-common/printf_fp.c: Likewise.
	* stdio-common/vfscanf.c: Likewise.
	* sysdeps/generic/strcasestr.c: Likewise.

	* math/bits/mathcalls.h: Fix typo.
Diffstat (limited to 'locale/programs/ld-collate.c')
-rw-r--r--locale/programs/ld-collate.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index 5d2cb57820..772ab1af33 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
@@ -1764,12 +1764,12 @@ collate_simple_weight (struct linereader *lr, struct localedef_t *locale,
 		    int base;
 
 		    ++runp;
-		    if (tolower (*runp) == 'x')
+		    if (_tolower (*runp) == 'x')
 		      {
 			++runp;
 			base = 16;
 		      }
-		    else if (tolower (*runp) == 'd')
+		    else if (_tolower (*runp) == 'd')
 		      {
 			++runp;
 			base = 10;
@@ -1777,7 +1777,7 @@ collate_simple_weight (struct linereader *lr, struct localedef_t *locale,
 		    else
 		      base = 8;
 
-		    dp = strchr (digits, tolower (*runp));
+		    dp = strchr (digits, _tolower (*runp));
 		    if (dp == NULL || (dp - digits) >= base)
 		      {
 		      illegal_char:
@@ -1789,7 +1789,7 @@ illegal character constant in string"));
 		    wch = dp - digits;
 		    ++runp;
 
-		    dp = strchr (digits, tolower (*runp));
+		    dp = strchr (digits, _tolower (*runp));
 		    if (dp == NULL || (dp - digits) >= base)
 		      goto illegal_char;
 		    wch *= base;
@@ -1798,7 +1798,7 @@ illegal character constant in string"));
 
 		    if (base != 16)
 		      {
-			dp = strchr (digits, tolower (*runp));
+			dp = strchr (digits, _tolower (*runp));
 			if (dp != NULL && (dp - digits < base))
 			  {
 			    wch *= base;