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

Timestamp:

2017-06-19T21:47:42Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

deacc58d

Parents:

7354b5e

Message:

ASSERT → assert

File:

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

kernel/generic/src/lib/str.c

@@ -109 +109 @@
 #include <errno.h>
 #include <align.h>
-#include <debug.h>
+#include <assert.h>
 #include <macros.h>
 #include <mm/slab.h>
@@ -567 +567 @@
 {
         /* There must be space for a null terminator in the buffer. */
-        ASSERT(size > 0);
-        ASSERT(src != NULL);
+        assert(size > 0);
+        assert(src != NULL);
         
         size_t src_off = 0;
@@ -601 +601 @@
 {
         /* There must be space for a null terminator in the buffer. */
-        ASSERT(size > 0);
+        assert(size > 0);
         
         size_t src_off = 0;
@@ -635 +635 @@
         size_t size = str_size(src) + 1;
         char *dest = malloc(size, 0);
-        ASSERT(dest);
+        assert(dest);
         
         str_cpy(dest, size, src);
@@ -668 +668 @@
         
         char *dest = malloc(size + 1, 0);
-        ASSERT(dest);
+        assert(dest);
         
         str_ncpy(dest, size + 1, src, size);
@@ -691 +691 @@
 
         /* There must be space for a null terminator in the buffer. */
-        ASSERT(size > 0);
+        assert(size > 0);
 
         src_idx = 0;
@@ -797 +797 @@
     bool *neg, uint64_t *result)
 {
-        ASSERT(endptr != NULL);
-        ASSERT(neg != NULL);
-        ASSERT(result != NULL);
+        assert(endptr != NULL);
+        assert(neg != NULL);
+        assert(result != NULL);
         
         *neg = false;
@@ -918 +918 @@
     bool strict, uint64_t *result)
 {
-        ASSERT(result != NULL);
+        assert(result != NULL);
         
         bool neg;