string-desc: Improve a declaration.

* lib/string-desc.h (_sd_char_at): Use _GL_ATTRIBUTE_NONNULL, not
_GL_ATTRIBUTE_NONNULL_IF_NONZERO.

diff --git a/ChangeLog b/ChangeLog
index 4a4d378fd37ce64acdcae64977c7555ceb809f7f..c71bacdda9b8d95c9019a60a4a686e7a500d6fec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-05-10  Bruno Haible  <bruno@clisp.org>
+
+       string-desc: Improve a declaration.
+       * lib/string-desc.h (_sd_char_at): Use _GL_ATTRIBUTE_NONNULL, not
+       _GL_ATTRIBUTE_NONNULL_IF_NONZERO.
+
 2025-05-10  Bruno Haible  <bruno@clisp.org>
 
        qcopy-acl: Update link dependencies after yesterday's change.

diff --git a/lib/string-desc.h b/lib/string-desc.h
index 114f8f3b574b6333332fad03390ebe459b31d5a0..8bd6691914a313b4ef5dffec77bdd9b371e3ad11 100644 (file)
--- a/lib/string-desc.h
+++ b/lib/string-desc.h
@@ -20,7 +20,8 @@
 #define _STRING_DESC_H 1
 
 /* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE,
-   _GL_ATTRIBUTE_NODISCARD, _GL_ATTRIBUTE_NONNULL_IF_NONZERO.  */
+   _GL_ATTRIBUTE_NODISCARD, _GL_ATTRIBUTE_NONNULL,
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO.  */
 #if !_GL_CONFIG_H_INCLUDED
  #error "Please include config.h first."
 #endif
@@ -318,7 +319,7 @@ sd_length (string_desc_t s)
    })
 GL_STRING_DESC_INLINE char
 _sd_char_at (idx_t s_nbytes, const char *s_data, idx_t i)
-  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 1)
+  _GL_ATTRIBUTE_NONNULL ((2))
 {
   if (!(i >= 0 && i < s_nbytes))
     /* Invalid argument.  */