Changeset 29e7cc7 in mainline for common/include/str.h

Timestamp:

2025-04-18T15:14:10Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'upstream/master' into helenraid

File:

• common/include/str.h (modified) (3 diffs)

common/include/str.h

@@ -45 +45 @@
 #include <mem.h>
 #include <_bits/decls.h>
+#include <_bits/mbstate_t.h>
 #include <_bits/uchar.h>
 
@@ -86 +87 @@
 
 extern char32_t str_decode(const char *str, size_t *offset, size_t sz);
+extern char32_t str_decode_r(const char *str, size_t *offset, size_t sz,
+        char32_t replacement, mbstate_t *mbstate);
 extern char32_t str_decode_reverse(const char *str, size_t *offset, size_t sz);
 extern errno_t chr_encode(char32_t ch, char *str, size_t *offset, size_t sz);
@@ -146 +149 @@
 extern char *str_tok(char *, const char *, char **);
 
+extern size_t str_sanitize(char *, size_t, uint8_t);
+
 extern errno_t str_uint8_t(const char *, const char **, unsigned int, bool,
     uint8_t *);