Changeset 28a5ebd in mainline for uspace/lib/c/include/str.h


Ignore:
Timestamp:
2020-06-18T15:39:50Z (4 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ce52c333
Parents:
4f663f3e
Message:

Use char32_t instead of wchat_t to represent UTF-32 strings

The intention of the native HelenOS string API has been always to
support Unicode in the UTF-8 and UTF-32 encodings as the sole character
representations and ignore the obsolete mess of older single-byte and
multibyte character encodings. Before C11, the wchar_t type has been
slightly misused for the purpose of the UTF-32 strings. The newer
char32_t type is obviously a much more suitable option. The standard
defines char32_t as uint_least32_t, thus we can take the liberty to fix
it to uint32_t.

To maintain compatilibity with the C Standard, the putwchar(wchar_t)
functions has been replaced by our custom putuchar(char32_t) functions
where appropriate.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/include/str.h

    r4f663f3e r28a5ebd  
    6767__HELENOS_DECLS_BEGIN;
    6868
    69 extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
    70 extern wchar_t str_decode_reverse(const char *str, size_t *offset, size_t sz);
    71 extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz);
     69extern char32_t str_decode(const char *str, size_t *offset, size_t sz);
     70extern char32_t str_decode_reverse(const char *str, size_t *offset, size_t sz);
     71extern errno_t chr_encode(char32_t ch, char *str, size_t *offset, size_t sz);
    7272
    7373extern size_t str_size(const char *str);
    74 extern size_t wstr_size(const wchar_t *str);
     74extern size_t wstr_size(const char32_t *str);
    7575
    7676extern size_t str_nsize(const char *str, size_t max_size);
    77 extern size_t wstr_nsize(const wchar_t *str, size_t max_size);
     77extern size_t wstr_nsize(const char32_t *str, size_t max_size);
    7878
    7979extern size_t str_lsize(const char *str, size_t max_len);
    80 extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
     80extern size_t wstr_lsize(const char32_t *str, size_t max_len);
    8181
    8282extern size_t str_length(const char *str);
    83 extern size_t wstr_length(const wchar_t *wstr);
     83extern size_t wstr_length(const char32_t *wstr);
    8484
    8585extern size_t str_nlength(const char *str, size_t size);
    86 extern size_t wstr_nlength(const wchar_t *str, size_t size);
     86extern size_t wstr_nlength(const char32_t *str, size_t size);
    8787
    88 extern size_t chr_width(wchar_t ch);
     88extern size_t chr_width(char32_t ch);
    8989extern size_t str_width(const char *str);
    9090
    91 extern bool ascii_check(wchar_t ch);
    92 extern bool chr_check(wchar_t ch);
     91extern bool ascii_check(char32_t ch);
     92extern bool chr_check(char32_t ch);
    9393
    9494extern int str_cmp(const char *s1, const char *s2);
    … …  
    105105
    106106extern errno_t spascii_to_str(char *dest, size_t size, const uint8_t *src, size_t n);
    107 extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
    108 extern char *wstr_to_astr(const wchar_t *src);
    109 extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
    110 extern wchar_t *str_to_awstr(const char *src);
     107extern void wstr_to_str(char *dest, size_t size, const char32_t *src);
     108extern char *wstr_to_astr(const char32_t *src);
     109extern void str_to_wstr(char32_t *dest, size_t dlen, const char *src);
     110extern char32_t *str_to_awstr(const char *src);
    111111extern errno_t utf16_to_str(char *dest, size_t size, const uint16_t *src);
    112112extern errno_t str_to_utf16(uint16_t *dest, size_t dlen, const char *src);
    113113extern size_t utf16_wsize(const uint16_t *ustr);
    114114
    115 extern char *str_chr(const char *str, wchar_t ch);
    116 extern char *str_rchr(const char *str, wchar_t ch);
     115extern char *str_chr(const char *str, char32_t ch);
     116extern char *str_rchr(const char *str, char32_t ch);
    117117extern char *str_str(const char *hs, const char *n);
    118118
    119 extern void str_rtrim(char *str, wchar_t ch);
    120 extern void str_ltrim(char *str, wchar_t ch);
     119extern void str_rtrim(char *str, char32_t ch);
     120extern void str_ltrim(char *str, char32_t ch);
    121121
    122 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
    123 extern bool wstr_remove(wchar_t *str, size_t pos);
     122extern bool wstr_linsert(char32_t *str, char32_t ch, size_t pos, size_t max_pos);
     123extern bool wstr_remove(char32_t *str, size_t pos);
    124124
    125125extern char *str_dup(const char *src);
Note: See TracChangeset for help on using the changeset viewer.