diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2003-07-22 22:10:55 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2003-07-22 22:10:55 +0000 |
| commit | 5c7070eaa3051ed57fd67919ba59ca1892e21ccc (patch) | |
| tree | b396dfe5891c5f24bd5d77dca5b3459446858b4e /lib/xmemcoll.c | |
| parent | b5bbe8412883ef390e4724f38f03f49d0223b9bc (diff) | |
| download | gnulib-5c7070eaa3051ed57fd67919ba59ca1892e21ccc.tar.gz | |
Sync with coreutils xalloc.h, xmalloc.c, xmemcoll.h, xmemcoll.c.
Diffstat (limited to 'lib/xmemcoll.c')
| -rw-r--r-- | lib/xmemcoll.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c index 7fe06b8cb3..0e30aef150 100644 --- a/lib/xmemcoll.c +++ b/lib/xmemcoll.c @@ -1,5 +1,5 @@ /* Locale-specific memory comparison. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,14 +32,11 @@ extern int errno; #define _(msgid) gettext (msgid) #include "error.h" +#include "exitfail.h" #include "memcoll.h" #include "quotearg.h" #include "xmemcoll.h" -/* Exit value when xmemcoll fails. - The caller may set it to some other value. */ -int xmemcoll_exit_failure = EXIT_FAILURE; - /* Compare S1 (with length S1LEN) and S2 (with length S2LEN) according to the LC_COLLATE locale. S1 and S2 do not overlap, and are not adjacent. Temporarily modify the bytes after S1 and S2, but @@ -56,7 +53,7 @@ xmemcoll (char *s1, size_t s1len, char *s2, size_t s2len) { error (0, collation_errno, _("string comparison failed")); error (0, 0, _("Set LC_ALL='C' to work around the problem.")); - error (xmemcoll_exit_failure, 0, + error (exit_failure, 0, _("The strings compared were %s and %s."), quotearg_n_style_mem (0, locale_quoting_style, s1, s1len), quotearg_n_style_mem (1, locale_quoting_style, s2, s2len)); |