Changeset 8b5001b in mainline for uspace/app/bdsh/input.c

Timestamp:

2009-12-01T20:07:06Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fd34f4e

Parents:

da2bd08 (diff), e866806 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/bdsh/input.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_nstr(str, ti->buffer, STR_BOUNDS(ti->nc) + 1);
-
-        return str;
+        return wstr_to_astr(ti->buffer);
 }