From: Jim Meyering <jim@meyering.net>
Date: Fri, 18 Jul 2003 07:11:50 +0000 (+0000)
Subject: Merge with gnulib.  Use a single exit_failure variable rather
X-Git-Tag: v5.0.90~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f73bf4c5d31a29be7173c0246386fac0e91338b8;p=thirdparty%2Fcoreutils.git

Merge with gnulib.  Use a single exit_failure variable rather
than a separate one for each module.
---

diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index 7fe06b8cb3..58c41b0f54 100644
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -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));