about summary refs log tree commit diff
path: root/intl/localealias.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-08-20 01:22:05 +0000
committerUlrich Drepper <drepper@redhat.com>2005-08-20 01:22:05 +0000
commitd6c7294ed609cbd8597898a1c92141dde23994bc (patch)
treeb2077c19a57c2df853ef6f9ade3fb88d4d2534a4 /intl/localealias.c
parent2a81f17880ff4d75cc6ef3fd4456cc23f28a6ed3 (diff)
downloadglibc-d6c7294ed609cbd8597898a1c92141dde23994bc.tar.gz
glibc-d6c7294ed609cbd8597898a1c92141dde23994bc.tar.xz
glibc-d6c7294ed609cbd8597898a1c92141dde23994bc.zip
* sysdeps/ia64/fpu/libm_error.c (__libm_error_support): Don't abort.
2005-08-17  Robert Love  <rml@novell.com>

	* sysdeps/unix/sysv/linux/sys/inotify.h: Add IN_MOVE_SELF event.

2005-08-19  Bruno Haible  <bruno@clisp.org>

	* intl/localealias.c (read_alias_file): In case of failure, close the
	file descriptor and sort the array before returning.

2005-08-19  Ulrich Drepper  <drepper@redhat.com>

	* malloc/Makefile: Link libmemusage.so with ld.so.
	* malloc/memusage.c: Use atomic operations for all counter and size
	 computations.  Handle thread stacks.
	* sysdeps/generic/memusage.h: Define memusage_cntr_t and
	memusage_size_t.
	* sysdeps/i386/i686/memusage.h: New file.
	* include/atomic.h: Define atomic_max and atomic_min.

	* debug/tst-chk1.c: Add tests for mbstowcs and wcstombs.
Diffstat (limited to 'intl/localealias.c')
-rw-r--r--intl/localealias.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/intl/localealias.c b/intl/localealias.c
index 32d05ff347..735107abd3 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -1,5 +1,5 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-2002, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -295,7 +295,7 @@ read_alias_file (fname, fname_len)
 
 	      if (nmap >= maxmap)
 		if (__builtin_expect (extend_alias_table (), 0))
-		  return added;
+		  goto out;
 
 	      alias_len = strlen (alias) + 1;
 	      value_len = strlen (value) + 1;
@@ -308,7 +308,7 @@ read_alias_file (fname, fname_len)
 					? alias_len + value_len : 1024));
 		  char *new_pool = (char *) realloc (string_space, new_size);
 		  if (new_pool == NULL)
-		    return added;
+		    goto out;
 
 		  if (__builtin_expect (string_space != new_pool, 0))
 		    {
@@ -349,6 +349,7 @@ read_alias_file (fname, fname_len)
 	while (strchr (buf, '\n') == NULL);
     }
 
+out:
   /* Should we test for ferror()?  I think we have to silently ignore
      errors.  --drepper  */
   fclose (fp);