summaryrefslogtreecommitdiff
path: root/tests/error.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2025-10-18 19:07:08 +0200
committerJörg Frings-Fürst <debian@jff.email>2025-10-18 19:07:08 +0200
commit693ae7b71dfdd1a8146266b5794a71c0dbe5dff0 (patch)
tree9704e2f7bd8962ea8911cd6f4e2d37227d7eff2e /tests/error.c
parentb8b9b0ac61ac47dddc58717f23619f8b06640498 (diff)
parent27dae84ed92f1ef0300263091972338d12e78348 (diff)
Update upstream source from tag 'upstream/1.4.1'
Update to upstream version '1.4.1' with Debian dir 8add41ffbfe3e6636eec0ec134c5af96832cc143
Diffstat (limited to 'tests/error.c')
-rw-r--r--tests/error.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/error.c b/tests/error.c
index 68168053..ab4c38f3 100644
--- a/tests/error.c
+++ b/tests/error.c
@@ -1,5 +1,5 @@
/* Error handler for noninteractive utilities
- Copyright (C) 1990-2024 Free Software Foundation, Inc.
+ Copyright (C) 1990-2025 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
@@ -38,7 +38,7 @@
#if !_LIBC && ENABLE_NLS
# include "gettext.h"
-# define _(msgid) gettext (msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
#endif
#ifdef _LIBC
@@ -165,8 +165,8 @@ flush_stdout (void)
#if !_LIBC
int stdout_fd;
-# if GNULIB_FREOPEN_SAFER
- /* Use of gnulib's freopen-safer module normally ensures that
+# if GNULIB_FREOPEN_SAFER || GNULIB_XSTDOPEN
+ /* Gnulib's freopen-safer and/or xstdopen modules normally ensure that
fileno (stdout) == 1
whenever stdout is open. */
stdout_fd = STDOUT_FILENO;
@@ -197,7 +197,7 @@ print_errno_message (int errnum)
if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
s = errbuf;
else
- s = 0;
+ s = NULL;
# endif
#else
s = strerror (errnum);