string-h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO in stpncpy

* lib/string.in.h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO instead of
_GL_ARG_NONNULL in stpncpy. This matches the spirit of N3322.

diff --git a/ChangeLog b/ChangeLog
index 6f8eccfc4e667639e2d40ff3148d6a1e3e1a60c5..239a217e7aeefbe6b4b52a8cf37a4c04f61beef2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2026-08-11  Lasse Collin  <lasse.collin@tukaani.org>
+
+       string-h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO in stpncpy.
+       * lib/string.in.h: Use _GL_ATTRIBUTE_NONNULL_IF_NONZERO instead of
+       _GL_ARG_NONNULL in stpncpy. This matches the spirit of N3322.
+
 2026-08-11  Lasse Collin  <lasse.collin@tukaani.org>
 
        string-h: Fix inconsistent nonnull attributes in strncpy.

diff --git a/lib/string.in.h b/lib/string.in.h
index 48637be94f2cac3287ac65fc518cd9bbfad80658..17ff019765898225eb7bade7c0a431e3213de375 100644 (file)
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -645,7 +645,8 @@ _GL_WARN_ON_USE (stpcpy, "stpcpy is unportable - "
 _GL_FUNCDECL_RPL (stpncpy, char *,
                   (char *restrict __dst, char const *restrict __src,
                    size_t __n),
-                  _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 _GL_CXXALIAS_RPL (stpncpy, char *,
                   (char *restrict __dst, char const *restrict __src,
                    size_t __n));
@@ -654,7 +655,8 @@ _GL_CXXALIAS_RPL (stpncpy, char *,
 _GL_FUNCDECL_SYS (stpncpy, char *,
                   (char *restrict __dst, char const *restrict __src,
                    size_t __n),
-                  _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 #  endif
 _GL_CXXALIAS_SYS (stpncpy, char *,
                   (char *restrict __dst, char const *restrict __src,