Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset e866806 in mainline for uspace/app/bdsh/input.c


Ignore:
Timestamp:
2009-11-30T20:07:07Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
4a2aa91, 8b5001b
Parents:
1df977c (diff), b67c7d6 (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 editor fix and string function improvements.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/bdsh/input.c

    r1df977c re866806  
    134134static char *tinput_get_str(tinput_t *ti)
    135135{
    136         char *str;
    137 
    138         str = malloc(STR_BOUNDS(ti->nc) + 1);
    139         if (str == NULL)
    140                 return NULL;
    141 
    142         wstr_nstr(str, ti->buffer, STR_BOUNDS(ti->nc) + 1);
    143 
    144         return str;
     136        return wstr_to_astr(ti->buffer);
    145137}
    146138
Note: See TracChangeset for help on using the changeset viewer.