Changes in / [65c1778:22e6802] in mainline


Ignore:
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/syscall/syscall.c

    r65c1778 r22e6802  
    6262
    6363#ifdef CONFIG_UDEBUG
     64        bool debug;
     65
    6466        /*
    6567         * Early check for undebugged tasks. We do not lock anything as this
    66          * test need not be precise in either direction.
     68         * test need not be precise in either way.
    6769         */
    68         if (THREAD->udebug.active) {
     70        debug = THREAD->udebug.active;
     71       
     72        if (debug) {
    6973                udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false);
    7074        }
     
    8387       
    8488#ifdef CONFIG_UDEBUG
    85         if (THREAD->udebug.active) {
     89        if (debug) {
    8690                udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true);
    8791       
  • uspace/lib/libc/generic/io/io.c

    r65c1778 r22e6802  
    341341size_t fread(void *buf, size_t size, size_t nmemb, FILE *stream)
    342342{
    343         size_t left, done;
    344 
    345         if (size == 0 || nmemb == 0)
    346                 return 0;
    347 
     343        size_t left = size * nmemb;
     344        size_t done = 0;
     345       
    348346        /* Make sure no data is pending write. */
    349347        _fflushbuf(stream);
    350 
    351         left = size * nmemb;
    352         done = 0;
    353348       
    354349        while ((left > 0) && (!stream->error) && (!stream->eof)) {
     
    370365static size_t _fwrite(const void *buf, size_t size, size_t nmemb, FILE *stream)
    371366{
    372         size_t left;
    373         size_t done;
    374 
    375         if (size == 0 || nmemb == 0)
    376                 return 0;
    377 
    378         left = size * nmemb;
    379         done = 0;
    380 
     367        size_t left = size * nmemb;
     368        size_t done = 0;
     369       
    381370        while ((left > 0) && (!stream->error)) {
    382371                ssize_t wr;
     
    432421        uint8_t b;
    433422        bool need_flush;
    434 
    435         if (size == 0 || nmemb == 0)
    436                 return 0;
    437 
     423       
    438424        /* If not buffered stream, write out directly. */
    439425        if (stream->btype == _IONBF) {
Note: See TracChangeset for help on using the changeset viewer.