Changes in uspace/app/edit/sheet.c [28a5ebd:7c3fb9b] in mainline

File:

• uspace/app/edit/sheet.c (modified) (6 diffs)

uspace/app/edit/sheet.c

@@ -79 +79 @@
 
         sh->data = malloc(sh->dbuf_size);
-        if (sh->data == NULL) {
-                free(sh);
+        if (sh->data == NULL)
                 return ENOMEM;
-        }
 
         list_initialize(&sh->tags);
@@ -195 +193 @@
         size_t copy_sz;
         size_t off, prev;
-        char32_t c;
+        wchar_t c;
 
         spp = sh->data + spos->b_off;
@@ -222 +220 @@
 {
         size_t cur_pos, prev_pos;
-        char32_t c;
+        wchar_t c;
         coord_t cc;
 
@@ -291 +289 @@
         size_t off;
         coord_t cc;
-        char32_t c;
+        wchar_t c;
         sheet_t *sh;
 
@@ -320 +318 @@
 
 /** Get a character at spt and return next spt */
-char32_t spt_next_char(spt_t spt, spt_t *next)
-{
-        char32_t ch = str_decode(spt.sh->data, &spt.b_off, spt.sh->text_size);
+wchar_t spt_next_char(spt_t spt, spt_t *next)
+{
+        wchar_t ch = str_decode(spt.sh->data, &spt.b_off, spt.sh->text_size);
         if (next)
                 *next = spt;
@@ -328 +326 @@
 }
 
-char32_t spt_prev_char(spt_t spt, spt_t *prev)
-{
-        char32_t ch = str_decode_reverse(spt.sh->data, &spt.b_off, spt.sh->text_size);
+wchar_t spt_prev_char(spt_t spt, spt_t *prev)
+{
+        wchar_t ch = str_decode_reverse(spt.sh->data, &spt.b_off, spt.sh->text_size);
         if (prev)
                 *prev = spt;