From: Lasse Collin <lasse.collin@tukaani.org>
Date: Fri, 31 Jul 2026 15:33:40 +0000 (+0300)
Subject: string-h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO in mbsnlen
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c70e5d012f5c19b9b61d2d40acdc7b0108630136;p=thirdparty%2Fgnulib.git

string-h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO in mbsnlen

* lib/string.in.h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO instead of
_GL_ARG_NONNULL in mbsnlen. This matches the spirit of N3322.
mbsnlen(NULL, 0) results in NULL < NULL comparison in lib/mbsnlen.c,
which is valid after N3322.
---

diff --git a/ChangeLog b/ChangeLog
index 3153e01e0c..3188107e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2026-08-11  Lasse Collin  <lasse.collin@tukaani.org>
+
+	string-h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO in mbsnlen.
+	* lib/string.in.h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO instead of
+	_GL_ARG_NONNULL in mbsnlen. This matches the spirit of N3322.
+	mbsnlen(NULL, 0) results in NULL < NULL comparison in lib/mbsnlen.c,
+	which is valid after N3322.
+
 2026-08-11  Lasse Collin  <lasse.collin@tukaani.org>
 
 	string-h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO in explicit_bzero.
diff --git a/lib/string.in.h b/lib/string.in.h
index 0d01995d0e..716d2471ee 100644
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -1358,7 +1358,7 @@ _GL_CXXALIASWARN (mbslen);
    at STRING and ending at STRING + LEN.  */
 _GL_EXTERN_C size_t mbsnlen (const char *string, size_t len)
      _GL_ATTRIBUTE_PURE
-     _GL_ARG_NONNULL ((1));
+     _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2);
 #endif
 
 #if @GNULIB_MBSCHR@