Ignore:
Timestamp:
2011-04-14T07:54:33Z (14 years ago)
Author:
Matus Dekanek <smekideki@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e05d6c3
Parents:
3f3afb9 (diff), 34e8bab (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 from development

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/app/bdsh/cmds/modules/cat/cat.c

    r3f3afb9 ra39cfb8  
    195195                                        wchar_t c = str_decode(buff, &offset, bytes);
    196196                                        if (c == 0) {
    197                                                 // reached end of string
     197                                                /* Reached end of string */
    198198                                                break;
    199199                                        }
     
    228228        int rc;
    229229       
    230         // reset global state
    231         // TODO: move to structure?
     230        /*
     231         * reset global state
     232         * TODO: move to structure?
     233         */
    232234        paging_enabled = false;
    233235        chars_remaining = 0;
Note: See TracChangeset for help on using the changeset viewer.