Changeset 330965c in mainline for uspace

Timestamp:

2009-08-08T15:40:59Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

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.

Location:

uspace/lib/libc/generic

Files:

• io/printf_core.c (modified) (1 diff)
• io/vsnprintf.c (modified) (1 diff)
• malloc.c (modified) (1 diff)

uspace/lib/libc/generic/io/printf_core.c

@@ -490 +490 @@
                 counter += retval;
         
-        /* Print tailing spaces */
+        /* Print trailing spaces */
         
         while (width-- > 0) {

uspace/lib/libc/generic/io/vsnprintf.c

@@ -100 +100 @@
         }
         
-        /* Buffer is big enought to print the whole string */
+        /* Buffer is big enough to print the whole string */
         memcpy((void *)(data->dst + data->len), (void *) str, size);
         data->len += size;

uspace/lib/libc/generic/malloc.c

@@ -392 +392 @@
                 if (orig_size - real_size >= STRUCT_OVERHEAD) {
                         /* Split the original block to a full block
-                           and a tailing free block */
+                           and a trailing free block */
                         block_init((void *) head, real_size, false);
                         block_init((void *) head + real_size,