Changeset 63e27ef in mainline for kernel/generic/src/main

Timestamp:

2017-06-19T21:47:42Z (9 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

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (4 diffs)
• main.c (modified) (2 diffs)

kernel/generic/src/main/kinit.c

@@ -42 +42 @@
  */
 
+#include <assert.h>
 #include <main/kinit.h>
 #include <config.h>
@@ -67 +68 @@
 #include <lib/rd.h>
 #include <ipc/ipc.h>
-#include <debug.h>
 #include <str.h>
 #include <sysinfo/stats.h>
@@ -240 +240 @@
                         name = "<unknown>";
                 
-                STATIC_ASSERT(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN);
+                static_assert(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN, "");
                 str_cpy(namebuf, TASK_NAME_BUFLEN, INIT_PREFIX);
                 str_cpy(namebuf + INIT_PREFIX_LEN,
@@ -251 +251 @@
                     init.tasks[i].size,
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-                ASSERT(page);
+                assert(page);
                 
                 int rc = program_create_from_image((void *) page, namebuf,

kernel/generic/src/main/main.c

@@ -48 +48 @@
 
 #include <arch/asm.h>
+#include <debug.h>
 #include <context.h>
 #include <print.h>
 #include <panic.h>
-#include <debug.h>
+#include <assert.h>
 #include <config.h>
 #include <time/clock.h>
@@ -98 +99 @@
  */
 #define CHECK_INT_TYPE_(signness, size) \
-        STATIC_ASSERT_VERBOSE(sizeof(signness##size##_t) * 8 == size, \
+        static_assert(sizeof(signness##size##_t) * 8 == size, \
             #signness #size "_t does not have " #size " bits");