--- a/src/cx/string.h Thu Nov 07 20:22:56 2024 +0100
+++ b/src/cx/string.h Thu Nov 07 22:46:58 2024 +0100
@@ -172,7 +172,9 @@
*
* @see cx_mutstrn()
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nonnull
+cx_attr_nodiscard
+cx_attr_cstr_arg(1)
cxmutstr cx_mutstr(char *cstring);
/**
@@ -191,7 +193,8 @@
*
* @see cx_mutstr()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
+cx_attr_access_rw(1, 2)
cxmutstr cx_mutstrn(
char *cstring,
size_t length
@@ -212,7 +215,9 @@
*
* @see cx_strn()
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nonnull
+cx_attr_nodiscard
+cx_attr_cstr_arg(1)
cxstring cx_str(const char *cstring);
@@ -232,7 +237,8 @@
*
* @see cx_str()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
+cx_attr_access_r(1, 2)
cxstring cx_strn(
const char *cstring,
size_t length
@@ -248,7 +254,7 @@
* @param str the mutable string to cast
* @return an immutable copy of the string pointer
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxstring cx_strcast(cxmutstr str);
/**
@@ -262,7 +268,6 @@
*
* @param str the string to free
*/
-__attribute__((__nonnull__))
void cx_strfree(cxmutstr *str);
/**
@@ -277,7 +282,7 @@
* @param alloc the allocator
* @param str the string to free
*/
-__attribute__((__nonnull__))
+cx_attr_nonnull_arg(1)
void cx_strfree_a(
const CxAllocator *alloc,
cxmutstr *str
@@ -293,7 +298,7 @@
* @param ... all strings
* @return the accumulated length of all strings
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
size_t cx_strlen(
size_t count,
...
@@ -317,7 +322,8 @@
* @param ... all other strings
* @return the concatenated string
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nodiscard
+cx_attr_nonnull
cxmutstr cx_strcat_ma(
const CxAllocator *alloc,
cxmutstr str,
@@ -393,7 +399,7 @@
* @see cx_strsubs_m()
* @see cx_strsubsl_m()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxstring cx_strsubs(
cxstring string,
size_t start
@@ -418,7 +424,7 @@
* @see cx_strsubs_m()
* @see cx_strsubsl_m()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxstring cx_strsubsl(
cxstring string,
size_t start,
@@ -440,7 +446,7 @@
* @see cx_strsubs()
* @see cx_strsubsl()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxmutstr cx_strsubs_m(
cxmutstr string,
size_t start
@@ -465,7 +471,7 @@
* @see cx_strsubs()
* @see cx_strsubsl()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxmutstr cx_strsubsl_m(
cxmutstr string,
size_t start,
@@ -484,7 +490,7 @@
*
* @see cx_strchr_m()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxstring cx_strchr(
cxstring string,
int chr
@@ -502,7 +508,7 @@
*
* @see cx_strchr()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxmutstr cx_strchr_m(
cxmutstr string,
int chr
@@ -520,7 +526,7 @@
*
* @see cx_strrchr_m()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxstring cx_strrchr(
cxstring string,
int chr
@@ -538,7 +544,7 @@
*
* @see cx_strrchr()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxmutstr cx_strrchr_m(
cxmutstr string,
int chr
@@ -560,7 +566,7 @@
* contained
* @see cx_strstr_m()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxstring cx_strstr(
cxstring haystack,
cxstring needle
@@ -582,7 +588,7 @@
* contained
* @see cx_strstr()
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxmutstr cx_strstr_m(
cxmutstr haystack,
cxstring needle
@@ -600,7 +606,9 @@
* @param output a pre-allocated array of at least \p limit length
* @return the actual number of split items
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nodiscard
+cx_attr_nonnull
+cx_attr_access_w(4, 3)
size_t cx_strsplit(
cxstring string,
cxstring delim,
@@ -627,7 +635,9 @@
* written to
* @return the actual number of split items
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nodiscard
+cx_attr_nonnull
+cx_attr_access_w(5)
size_t cx_strsplit_a(
const CxAllocator *allocator,
cxstring string,
@@ -649,7 +659,9 @@
* @param output a pre-allocated array of at least \p limit length
* @return the actual number of split items
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nodiscard
+cx_attr_nonnull
+cx_attr_access_w(4, 3)
size_t cx_strsplit_m(
cxmutstr string,
cxstring delim,
@@ -676,7 +688,9 @@
* written to
* @return the actual number of split items
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nodiscard
+cx_attr_nonnull
+cx_attr_access_w(5)
size_t cx_strsplit_ma(
const CxAllocator *allocator,
cxmutstr string,
@@ -693,7 +707,7 @@
* @return negative if \p s1 is smaller than \p s2, positive if \p s1 is larger
* than \p s2, zero if both strings equal
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
int cx_strcmp(
cxstring s1,
cxstring s2
@@ -707,7 +721,7 @@
* @return negative if \p s1 is smaller than \p s2, positive if \p s1 is larger
* than \p s2, zero if both strings equal ignoring case
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
int cx_strcasecmp(
cxstring s1,
cxstring s2
@@ -723,7 +737,8 @@
* @return negative if \p s1 is smaller than \p s2, positive if \p s1 is larger
* than \p s2, zero if both strings equal
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nodiscard
+cx_attr_nonnull
int cx_strcmp_p(
const void *s1,
const void *s2
@@ -739,7 +754,8 @@
* @return negative if \p s1 is smaller than \p s2, positive if \p s1 is larger
* than \p s2, zero if both strings equal ignoring case
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nodiscard
+cx_attr_nonnull
int cx_strcasecmp_p(
const void *s1,
const void *s2
@@ -758,7 +774,8 @@
* @return a duplicate of the string
* @see cx_strdup()
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nodiscard
+cx_attr_nonnull
cxmutstr cx_strdup_a(
const CxAllocator *allocator,
cxstring string
@@ -816,7 +833,7 @@
* @param string the string that shall be trimmed
* @return the trimmed string
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxstring cx_strtrim(cxstring string);
/**
@@ -828,7 +845,7 @@
* @param string the string that shall be trimmed
* @return the trimmed string
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
cxmutstr cx_strtrim_m(cxmutstr string);
/**
@@ -839,7 +856,7 @@
* @return \c true, if and only if the string has the specified prefix,
* \c false otherwise
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
bool cx_strprefix(
cxstring string,
cxstring prefix
@@ -853,7 +870,7 @@
* @return \c true, if and only if the string has the specified suffix,
* \c false otherwise
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
bool cx_strsuffix(
cxstring string,
cxstring suffix
@@ -867,7 +884,7 @@
* @return \c true, if and only if the string has the specified prefix,
* \c false otherwise
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
bool cx_strcaseprefix(
cxstring string,
cxstring prefix
@@ -881,7 +898,7 @@
* @return \c true, if and only if the string has the specified suffix,
* \c false otherwise
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
bool cx_strcasesuffix(
cxstring string,
cxstring suffix
@@ -926,7 +943,8 @@
* @param replmax maximum number of replacements
* @return the resulting string after applying the replacements
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nodiscard
+cx_attr_nonnull
cxmutstr cx_strreplacen_a(
const CxAllocator *allocator,
cxstring str,
@@ -1004,7 +1022,7 @@
* @param limit the maximum number of tokens that shall be returned
* @return a new string tokenization context
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
CxStrtokCtx cx_strtok(
cxstring str,
cxstring delim,
@@ -1019,7 +1037,7 @@
* @param limit the maximum number of tokens that shall be returned
* @return a new string tokenization context
*/
-__attribute__((__warn_unused_result__))
+cx_attr_nodiscard
CxStrtokCtx cx_strtok_m(
cxmutstr str,
cxstring delim,
@@ -1036,7 +1054,9 @@
* @return true if successful, false if the limit or the end of the string
* has been reached
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nonnull
+cx_attr_nodiscard
+cx_attr_access_w(2)
bool cx_strtok_next(
CxStrtokCtx *ctx,
cxstring *token
@@ -1054,7 +1074,9 @@
* @return true if successful, false if the limit or the end of the string
* has been reached
*/
-__attribute__((__warn_unused_result__, __nonnull__))
+cx_attr_nonnull
+cx_attr_nodiscard
+cx_attr_access_w(2)
bool cx_strtok_next_m(
CxStrtokCtx *ctx,
cxmutstr *token
@@ -1067,7 +1089,8 @@
* @param delim array of more delimiters
* @param count number of elements in the array
*/
-__attribute__((__nonnull__))
+cx_attr_nonnull
+cx_attr_access_r(2, 3)
void cx_strtok_delim(
CxStrtokCtx *ctx,
const cxstring *delim,