Changeset b67c7d64 in mainline for uspace/app

Timestamp:

2009-11-30T19:51:29Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e866806

Parents:

0f06dbc

Message:

Add wstr_to_astr() for easy conversion from wide string to string.

Location:

uspace/app

Files:

• bdsh/input.c (modified) (1 diff)
• edit/edit.c (modified) (1 diff)

uspace/app/bdsh/input.c

@@ -134 +134 @@
 static char *tinput_get_str(tinput_t *ti)
 {
-        char *str;
-
-        str = malloc(STR_BOUNDS(ti->nc) + 1);
-        if (str == NULL)
-                return NULL;
-
-        wstr_to_str(str, STR_BOUNDS(ti->nc) + 1, ti->buffer);
-
-        return str;
+        return wstr_to_astr(ti->buffer);
 }
 

uspace/app/edit/edit.c

@@ -391 +391 @@
 
         buffer[nc] = '\0';
-
-        str = malloc(STR_BOUNDS(wstr_length(buffer)) + 1);
-        if (str == NULL)
-                return NULL;
-
-        wstr_to_str(str, STR_BOUNDS(wstr_length(buffer)) + 1, buffer);
+        str = wstr_to_astr(buffer);
 
         console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);