Changeset b1c57a8 in mainline for kernel/generic/src/lib/str.c

Timestamp:

2014-10-09T15:03:55Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (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 lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

• kernel/generic/src/lib/str.c (modified) (2 diffs)

kernel/generic/src/lib/str.c

@@ -111 +111 @@
 #include <debug.h>
 #include <macros.h>
+#include <mm/slab.h>
 
 /** Check the condition if wchar_t is signed */
@@ -567 +568 @@
         /* There must be space for a null terminator in the buffer. */
         ASSERT(size > 0);
+        ASSERT(src != NULL);
         
         size_t src_off = 0;