From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 1 Jul 2025 00:50:58 +0000 (-0700)
Subject: openat-die: revert recent changes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9297749090b01720888dceeb5f6dab3d52dcef40;p=thirdparty%2Fgnulib.git

openat-die: revert recent changes

* lib/openat.die: Revert recent changes as per email in:
https://lists.gnu.org/r/bug-gnulib/2025-06/msg00325.html
---

diff --git a/ChangeLog b/ChangeLog
index 19b16ab146..ffc5512e71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-2025-06-30  Paul Eggert  <eggert@cs.ucla.edu>
-
-	openat-die: pacify Apple clang-1400.0.29.202
-	* lib/openat-die.c (openat_save_fail, openat_restore_fail):
-	[!GNULIB_LIBPOSIX]: Pacify-Wformat-security on this platform.
-
 2025-06-30  Bruno Haible  <bruno@clisp.org>
 
 	options tests: Fix link error.
diff --git a/lib/openat-die.c b/lib/openat-die.c
index 3fbb5d86e4..79a5b23bc8 100644
--- a/lib/openat-die.c
+++ b/lib/openat-die.c
@@ -34,7 +34,7 @@ _Noreturn void
 openat_save_fail (int errnum)
 {
 #ifndef GNULIB_LIBPOSIX
-  error (exit_failure, errnum, "%s",
+  error (exit_failure, errnum,
          _("unable to record current working directory"));
 #endif
   /* _Noreturn cannot be applied to error, since it returns
@@ -53,7 +53,7 @@ _Noreturn void
 openat_restore_fail (int errnum)
 {
 #ifndef GNULIB_LIBPOSIX
-  error (exit_failure, errnum, "%s",
+  error (exit_failure, errnum,
          _("failed to return to initial working directory"));
 #endif