Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/str.h

    r28a5ebd rd066259  
    4444
    4545/* Common Unicode characters */
    46 #define U_SPECIAL  '?'
     46#define U_SPECIAL      '?'
    4747
    4848#define U_LEFT_ARROW   0x2190
    … …  
    6969#define STR_BOUNDS(length)  ((length) << 2)
    7070
    71 extern char32_t str_decode(const char *, size_t *, size_t);
    72 extern errno_t chr_encode(char32_t, char *, size_t *, size_t);
     71extern wchar_t str_decode(const char *str, size_t *offset, size_t sz);
     72extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz);
    7373
    74 extern size_t str_size(const char *);
    75 extern size_t wstr_size(const char32_t *);
     74extern size_t str_size(const char *str);
     75extern size_t wstr_size(const wchar_t *str);
    7676
    77 extern size_t str_lsize(const char *, size_t);
    78 extern size_t wstr_lsize(const char32_t *, size_t);
     77extern size_t str_lsize(const char *str, size_t max_len);
     78extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
    7979
    80 extern size_t str_length(const char *);
    81 extern size_t wstr_length(const char32_t *);
     80extern size_t str_length(const char *str);
     81extern size_t wstr_length(const wchar_t *wstr);
    8282
    83 extern size_t str_nlength(const char *, size_t);
    84 extern size_t wstr_nlength(const char32_t *, size_t);
     83extern size_t str_nlength(const char *str, size_t size);
     84extern size_t wstr_nlength(const wchar_t *str, size_t size);
    8585
    86 extern bool ascii_check(char32_t);
    87 extern bool chr_check(char32_t);
     86extern bool ascii_check(wchar_t ch);
     87extern bool chr_check(wchar_t ch);
    8888
    89 extern int str_cmp(const char *, const char *);
    90 extern int str_lcmp(const char *, const char *, size_t);
     89extern int str_cmp(const char *s1, const char *s2);
     90extern int str_lcmp(const char *s1, const char *s2, size_t max_len);
    9191
    92 extern void str_cpy(char *, size_t, const char *);
    93 extern void str_ncpy(char *, size_t, const char *, size_t);
    94 extern void wstr_to_str(char *, size_t, const char32_t *);
     92extern void str_cpy(char *dest, size_t size, const char *src);
     93extern void str_ncpy(char *dest, size_t size, const char *src, size_t n);
     94extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
    9595
    96 extern char *str_chr(const char *, char32_t);
     96extern char *str_chr(const char *str, wchar_t ch);
    9797
    98 extern bool wstr_linsert(char32_t *, char32_t, size_t, size_t);
    99 extern bool wstr_remove(char32_t *, size_t);
     98extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
     99extern bool wstr_remove(wchar_t *str, size_t pos);
    100100
    101 extern char *str_dup(const char *);
    102 extern char *str_ndup(const char *, size_t);
     101extern char *str_dup(const char *src);
     102extern char *str_ndup(const char *src, size_t n);
    103103
    104104extern errno_t str_uint64_t(const char *, char **, unsigned int, bool,
    … …  
    108108extern void bin_order_suffix(const uint64_t, uint64_t *, const char **, bool);
    109109
    110 extern const char *str_error(errno_t);
    111 extern const char *str_error_name(errno_t);
     110extern const char *str_error(errno_t err);
     111extern const char *str_error_name(errno_t err);
    112112
    113113#endif
Note: See TracChangeset for help on using the changeset viewer.