From: Collin Funk <collin.funk1@gmail.com>
Date: Sun, 8 Mar 2026 00:16:01 +0000 (-0800)
Subject: maint: prefer memset_explicit to explicit_bzero
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab80700bd2a6d11cfe17f8de0313e2ac13260965;p=thirdparty%2Fcoreutils.git

maint: prefer memset_explicit to explicit_bzero

The explicit_bzero function is a common extension, but memset_explicit
was standardized in C23. It will likely become more portable in the
future, and Gnulib provides an implementation if needed.

* bootstrap.conf (gnulib_modules): Add memset_explicit. Remove
explicit_bzero.
* gl/lib/randint.c (randint_free): Use memset_explicit instead of
explicit_bzero.
* gl/lib/randread.c (randread_free_body): Likewise.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index 1cab8a8049..331382841c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -90,7 +90,6 @@ gnulib_modules="
   euidaccess
   exclude
   exitfail
-  explicit_bzero
   faccessat
   fadvise
   fchdir
@@ -187,6 +186,7 @@ gnulib_modules="
   memcmp2
   mempcpy
   memrchr
+  memset_explicit
   minmax
   mkancesdirs
   mkdir
diff --git a/gl/lib/randint.c b/gl/lib/randint.c
index bd3ce38217..97fe0bf909 100644
--- a/gl/lib/randint.c
+++ b/gl/lib/randint.c
@@ -198,7 +198,7 @@ randint_genmax (struct randint_source *s, randint genmax)
 void
 randint_free (struct randint_source *s)
 {
-  explicit_bzero (s, sizeof *s);
+  memset_explicit (s, 0, sizeof *s);
   free (s);
 }
 
diff --git a/gl/lib/randread.c b/gl/lib/randread.c
index be0267a64e..249d400c97 100644
--- a/gl/lib/randread.c
+++ b/gl/lib/randread.c
@@ -153,7 +153,7 @@ static int
 randread_free_body (struct randread_source *s)
 {
   FILE *source = s->source;
-  explicit_bzero (s, sizeof *s);
+  memset_explicit (s, 0, sizeof *s);
   free (s);
   return source ? fclose (source) : 0;
 }