Changeset 28a5ebd in mainline for uspace/app/edit/search.c

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:

• uspace/app/edit/search.c (modified) (4 diffs)

uspace/app/edit/search.c

@@ -50 +50 @@
                 return NULL;
 
-        wchar_t *p = str_to_awstr(pattern);
+        char32_t *p = str_to_awstr(pattern);
         if (p == NULL) {
                 free(search);
@@ -63 +63 @@
                 half = search->pattern_length / 2;
                 for (pos = 0; pos < half; pos++) {
-                        wchar_t tmp = p[pos];
+                        char32_t tmp = p[pos];
                         p[pos] = p[search->pattern_length - pos - 1];
                         p[search->pattern_length - pos - 1] = tmp;
@@ -107 +107 @@
         search_equals_fn eq = s->ops.equals;
 
-        wchar_t cur_char;
+        char32_t cur_char;
         errno_t rc = EOK;
         while ((rc = s->ops.producer(s->client_data, &cur_char)) == EOK && cur_char > 0) {
@@ -141 +141 @@
 }
 
-bool char_exact_equals(const wchar_t a, const wchar_t b)
+bool char_exact_equals(const char32_t a, const char32_t b)
 {
         return a == b;