diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2025-10-18 19:07:35 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2025-10-18 19:07:35 +0200 |
| commit | fa23d938c040bc8af305a31fa874df55b2a02576 (patch) | |
| tree | 9704e2f7bd8962ea8911cd6f4e2d37227d7eff2e /tests/error.c | |
| parent | df9dbf9b0915e432a4a2c4182f60af36374eaaab (diff) | |
| parent | 693ae7b71dfdd1a8146266b5794a71c0dbe5dff0 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'tests/error.c')
| -rw-r--r-- | tests/error.c | 10 |
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); |