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 3153e01e0cbe69dcc324cb7b07b7952430b4cc2b..3188107e1d48ec713c23ea16702b4d44d99f1bd6 100644 (file)
--- 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 0d01995d0ea3d6d5184bd671a1ca361661b3c42e..716d2471ee6b7c9086f24284cecc6756289decca 100644 (file)
--- 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@