diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:30:36 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 19:30:36 +0000 |
commit | 704e05ff173885df6d1d27f381604429f27fd4de (patch) | |
tree | fc67caec36bc5ed0c4190cafd38f69850a10ca0a /locale/programs/repertoire.c | |
parent | ecfe3e291f848cf598309d746619de62ea88fabb (diff) | |
parent | 3fcbb67b7949a8b362de5558bf1c6dd7ec5d21cf (diff) |
Merge branch 't/tls-threadvar' into refs/top-bases/t/ONSTACK
Diffstat (limited to 'locale/programs/repertoire.c')
-rw-r--r-- | locale/programs/repertoire.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/locale/programs/repertoire.c b/locale/programs/repertoire.c index c39870759c..ac83988ebf 100644 --- a/locale/programs/repertoire.c +++ b/locale/programs/repertoire.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2016 Free Software Foundation, Inc. +/* Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -20,7 +20,6 @@ #endif #include <errno.h> -#include <error.h> #include <limits.h> #include <obstack.h> #include <search.h> @@ -321,14 +320,14 @@ argument to <%s> must be a single character"), } if (state != 2 && state != 90 && !be_quiet) - WITH_CUR_LOCALE (error (0, 0, _("%s: premature end of file"), - repfile->fname)); + record_error (0, 0, _("%s: premature end of file"), + repfile->fname); lr_close (repfile); if (tsearch (result, &known, &repertoire_compare) == NULL) /* Something went wrong. */ - WITH_CUR_LOCALE (error (0, errno, _("cannot save new repertoire map"))); + record_error (0, errno, _("cannot save new repertoire map")); return result; } @@ -339,8 +338,8 @@ repertoire_complain (const char *name) { if (tfind (name, &unavailable, (__compar_fn_t) strcmp) == NULL) { - WITH_CUR_LOCALE (error (0, errno, _("\ -repertoire map file `%s' not found"), name)); + record_error (0, errno, _("\ +repertoire map file `%s' not found"), name); /* Remember that we reported this map. */ tsearch (name, &unavailable, (__compar_fn_t) strcmp); |