Changeset 28a5ebd in mainline for kernel/generic/include


Ignore:
Timestamp:
2020-06-18T15:39:50Z (5 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.

Location:
kernel/generic/include
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/console/chardev.h

    r4f663f3e r28a5ebd  
    5555typedef struct {
    5656        /** Read character directly from device, assume interrupts disabled. */
    57         wchar_t (*poll)(struct indev *);
     57        char32_t (*poll)(struct indev *);
    5858
    5959        /** Signal out-of-band condition. */
    … …  
    6868        /** Protects everything below. */
    6969        IRQ_SPINLOCK_DECLARE(lock);
    70         wchar_t buffer[INDEV_BUFLEN];
     70        char32_t buffer[INDEV_BUFLEN];
    7171        size_t counter;
    7272
    … …  
    8282typedef struct {
    8383        /** Write character to output. */
    84         void (*write)(struct outdev *, wchar_t);
     84        void (*write)(struct outdev *, char32_t);
    8585
    8686        /** Redraw any previously cached characters. */
    … …  
    112112extern void indev_initialize(const char *, indev_t *,
    113113    indev_operations_t *);
    114 extern void indev_push_character(indev_t *, wchar_t);
    115 extern wchar_t indev_pop_character(indev_t *);
     114extern void indev_push_character(indev_t *, char32_t);
     115extern char32_t indev_pop_character(indev_t *);
    116116extern void indev_signal(indev_t *, indev_signal_t);
    117117

  • kernel/generic/include/console/console.h

    r4f663f3e r28a5ebd  
    5757extern outdev_t *stdout;
    5858
    59 extern void early_putwchar(wchar_t);
     59extern void early_putuchar(char32_t);
    6060
    6161extern indev_t *stdin_wire(void);
    … …  
    6666extern void kio_update(void *);
    6767extern void kio_flush(void);
    68 extern void kio_push_char(const wchar_t);
     68extern void kio_push_char(const char32_t);
    6969SPINLOCK_EXTERN(kio_lock);
    7070
    71 extern wchar_t getc(indev_t *indev);
     71extern char32_t getc(indev_t *indev);
    7272extern size_t gets(indev_t *indev, char *buf, size_t buflen);
    7373extern sys_errno_t sys_kio(int cmd, uspace_addr_t buf, size_t size);

  • kernel/generic/include/printf/printf_core.h

    r4f663f3e r28a5ebd  
    3838#include <stdarg.h>
    3939#include <stddef.h>
     40#include <uchar.h>
    4041
    4142/** Structure for specifying output methods for different printf clones. */
    … …  
    4546
    4647        /* Wide string output function, returns number of printed characters or EOF */
    47         int (*wstr_write)(const wchar_t *, size_t, void *);
     48        int (*wstr_write)(const char32_t *, size_t, void *);
    4849
    4950        /* User data - output stream specification, state, locks, etc. */

  • kernel/generic/include/putchar.h

    r4f663f3e r28a5ebd  
    3636#define KERN_PUTCHAR_H_
    3737
    38 #include <stddef.h>
     38#include <uchar.h>
    3939
    40 extern void putwchar(wchar_t);
     40extern void putuchar(char32_t);
    4141
    4242#endif

  • kernel/generic/include/str.h

    r4f663f3e r28a5ebd  
    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 wchar_t str_decode(const char *str, size_t *offset, size_t sz);
    72 extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz);
     71extern char32_t str_decode(const char *, size_t *, size_t);
     72extern errno_t chr_encode(char32_t, char *, size_t *, size_t);
    7373
    74 extern size_t str_size(const char *str);
    75 extern size_t wstr_size(const wchar_t *str);
     74extern size_t str_size(const char *);
     75extern size_t wstr_size(const char32_t *);
    7676
    77 extern size_t str_lsize(const char *str, size_t max_len);
    78 extern size_t wstr_lsize(const wchar_t *str, size_t max_len);
     77extern size_t str_lsize(const char *, size_t);
     78extern size_t wstr_lsize(const char32_t *, size_t);
    7979
    80 extern size_t str_length(const char *str);
    81 extern size_t wstr_length(const wchar_t *wstr);
     80extern size_t str_length(const char *);
     81extern size_t wstr_length(const char32_t *);
    8282
    83 extern size_t str_nlength(const char *str, size_t size);
    84 extern size_t wstr_nlength(const wchar_t *str, size_t size);
     83extern size_t str_nlength(const char *, size_t);
     84extern size_t wstr_nlength(const char32_t *, size_t);
    8585
    86 extern bool ascii_check(wchar_t ch);
    87 extern bool chr_check(wchar_t ch);
     86extern bool ascii_check(char32_t);
     87extern bool chr_check(char32_t);
    8888
    89 extern int str_cmp(const char *s1, const char *s2);
    90 extern int str_lcmp(const char *s1, const char *s2, size_t max_len);
     89extern int str_cmp(const char *, const char *);
     90extern int str_lcmp(const char *, const char *, size_t);
    9191
    92 extern void str_cpy(char *dest, size_t size, const char *src);
    93 extern void str_ncpy(char *dest, size_t size, const char *src, size_t n);
    94 extern void wstr_to_str(char *dest, size_t size, const wchar_t *src);
     92extern void str_cpy(char *, size_t, const char *);
     93extern void str_ncpy(char *, size_t, const char *, size_t);
     94extern void wstr_to_str(char *, size_t, const char32_t *);
    9595
    96 extern char *str_chr(const char *str, wchar_t ch);
     96extern char *str_chr(const char *, char32_t);
    9797
    98 extern bool wstr_linsert(wchar_t *str, wchar_t ch, size_t pos, size_t max_pos);
    99 extern bool wstr_remove(wchar_t *str, size_t pos);
     98extern bool wstr_linsert(char32_t *, char32_t, size_t, size_t);
     99extern bool wstr_remove(char32_t *, size_t);
    100100
    101 extern char *str_dup(const char *src);
    102 extern char *str_ndup(const char *src, size_t n);
     101extern char *str_dup(const char *);
     102extern char *str_ndup(const char *, size_t);
    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 err);
    111 extern const char *str_error_name(errno_t err);
     110extern const char *str_error(errno_t);
     111extern const char *str_error_name(errno_t);
    112112
    113113#endif
Note: See TracChangeset for help on using the changeset viewer.