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

Changeset 330965c in mainline


Ignore:
Timestamp:
2009-08-08T15:40:59Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
24f27bb, c145bc2
Parents:
31de325 (diff), 42cfd91 (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.

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/ipc/event.c

    r31de325 r330965c  
    4545#include <arch.h>
    4646
    47 /**
    48  * The events array.
    49  * Arranging the events in this two-dimensional array should decrease the
    50  * likelyhood of cacheline ping-pong.
    51  */
     47/** The events array. */
    5248static event_t events[EVENT_END];
    5349
  • kernel/generic/src/printf/printf_core.c

    r31de325 r330965c  
    491491                counter += retval;
    492492       
    493         /* Print tailing spaces */
     493        /* Print trailing spaces */
    494494       
    495495        while (width-- > 0) {
  • kernel/generic/src/printf/vsnprintf.c

    r31de325 r330965c  
    100100        }
    101101       
    102         /* Buffer is big enought to print the whole string */
     102        /* Buffer is big enough to print the whole string */
    103103        memcpy((void *)(data->dst + data->len), (void *) str, size);
    104104        data->len += size;
  • uspace/lib/libc/generic/io/printf_core.c

    r31de325 r330965c  
    490490                counter += retval;
    491491       
    492         /* Print tailing spaces */
     492        /* Print trailing spaces */
    493493       
    494494        while (width-- > 0) {
  • uspace/lib/libc/generic/io/vsnprintf.c

    r31de325 r330965c  
    100100        }
    101101       
    102         /* Buffer is big enought to print the whole string */
     102        /* Buffer is big enough to print the whole string */
    103103        memcpy((void *)(data->dst + data->len), (void *) str, size);
    104104        data->len += size;
  • uspace/lib/libc/generic/malloc.c

    r31de325 r330965c  
    392392                if (orig_size - real_size >= STRUCT_OVERHEAD) {
    393393                        /* Split the original block to a full block
    394                            and a tailing free block */
     394                           and a trailing free block */
    395395                        block_init((void *) head, real_size, false);
    396396                        block_init((void *) head + real_size,
Note: See TracChangeset for help on using the changeset viewer.