From: Bruno Haible <bruno@clisp.org>
Date: Sat, 10 May 2025 13:06:47 +0000 (+0200)
Subject: string-desc: Improve a declaration.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66301a2e507024fbecfdba14a61eec1cfd2cb3c3;p=thirdparty%2Fgnulib.git

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 4a4d378fd3..c71bacdda9 100644
--- 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 114f8f3b57..8bd6691914 100644
--- 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.  */