summary refs log tree commit diff
path: root/locale/programs/locfile.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-02-05 23:29:24 +0000
committerUlrich Drepper <drepper@redhat.com>2002-02-05 23:29:24 +0000
commitf2b98f97ebc32b68271505131b745289f3255984 (patch)
treec0b00f281985b708c6b991648a05be6752f96868 /locale/programs/locfile.c
parent475361200b40615d2d459c8d6a7544fdf4f9533a (diff)
downloadglibc-f2b98f97ebc32b68271505131b745289f3255984.tar.gz
glibc-f2b98f97ebc32b68271505131b745289f3255984.tar.xz
glibc-f2b98f97ebc32b68271505131b745289f3255984.zip
Update.
	* inet/getnetgrent_r.c (innetgr): Add int* parameter to getfct
	definition and pass &errno in use of this variable.
	Reported by Simon Wilkinson <simon@sxw.org.uk> [PR libc/2911].

2002-02-04  Andreas Schwab  <schwab@suse.de>

	* locale/programs/localedef.h (WITH_CUR_LOCALE): Define.
	* locale/programs/charmap-dir.c: Wrap calls that output messages
	with WITH_CUR_LOCALE.  Include "localedef.h" first.
	* locale/programs/charmap.c: Likewise.
	* locale/programs/ld-address.c: Likewise.
	* locale/programs/ld-collate.c: Likewise.
	* locale/programs/ld-ctype.c: Likewise.
	* locale/programs/ld-identification.c: Likewise.
	* locale/programs/ld-measurement.c: Likewise.
	* locale/programs/ld-messages.c: Likewise.
	* locale/programs/ld-monetary.c: Likewise.
	* locale/programs/ld-name.c: Likewise.
	* locale/programs/ld-numeric.c: Likewise.
	* locale/programs/ld-paper.c: Likewise.
	* locale/programs/ld-telephone.c: Likewise.
	* locale/programs/ld-time.c: Likewise.
	* locale/programs/linereader.c: Likewise.
	* locale/programs/linereader.h: Likewise.
	* locale/programs/localedef.c: Likewise.
	* locale/programs/locfile.c: Likewise.
	* locale/programs/repertoire.c: Likewise.

2002-02-05  Ulrich Drepper  <drepper@redhat.com>
Diffstat (limited to 'locale/programs/locfile.c')
-rw-r--r--locale/programs/locfile.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index d2e9ba1382..07a65bbb54 100644
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
 
@@ -568,9 +568,8 @@ write_locale_data (const char *output_path, const char *category,
       if (fd == -1)
 	{
 	  if (!be_quiet)
-	    error (0, save_err, _("\
-cannot open output file `%s' for category `%s'"),
-		   fname, category);
+	    WITH_CUR_LOCALE (error (0, save_err, _("\
+cannot open output file `%s' for category `%s'"), fname, category));
 	  free (fname);
 	  return;
 	}
@@ -593,8 +592,8 @@ cannot open output file `%s' for category `%s'"),
       if (writev (fd, &vec[cnt], step) < 0)
 	{
 	  if (!be_quiet)
-	    error (0, errno, _("failure while writing data for category `%s'"),
-		   category);
+	    WITH_CUR_LOCALE (error (0, errno, _("\
+failure while writing data for category `%s'"), category));
 	  break;
 	}
     }
@@ -690,9 +689,8 @@ cannot open output file `%s' for category `%s'"),
 			      if (rename (tmp_fname, fname) < 0)
 				{
 				  if (!be_quiet)
-				    error (0, errno, _("\
-cannot create output file `%s' for category `%s'"),
-					   fname, category);
+				    WITH_CUR_LOCALE (error (0, errno, _("\
+cannot create output file `%s' for category `%s'"), fname, category));
 				}
 			      free (tmp_fname);
 			      free (other_fname);