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

Timestamp:

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

Files:

• stats.c (modified) (3 diffs)
• sysinfo.c (modified) (9 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -34 +34 @@
  */
 
+#include <assert.h>
 #include <typedefs.h>
 #include <abi/sysinfo.h>
@@ -231 +232 @@
 static void produce_stats_task(task_t *task, stats_task_t *stats_task)
 {
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&task->lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&task->lock));
         
         stats_task->task_id = task->taskid;
@@ -333 +334 @@
 static void produce_stats_thread(thread_t *thread, stats_thread_t *stats_thread)
 {
-        ASSERT(interrupts_disabled());
-        ASSERT(irq_spinlock_locked(&thread->lock));
+        assert(interrupts_disabled());
+        assert(irq_spinlock_locked(&thread->lock));
         
         stats_thread->thread_id = thread->tid;

kernel/generic/src/sysinfo/sysinfo.c

@@ -34 +34 @@
  */
 
+#include <assert.h>
 #include <sysinfo/sysinfo.h>
 #include <mm/slab.h>
@@ -125 +126 @@
     sysinfo_item_t *subtree, sysinfo_return_t **ret, bool dry_run)
 {
-        ASSERT(subtree != NULL);
+        assert(subtree != NULL);
         
         sysinfo_item_t *cur = subtree;
@@ -191 +192 @@
     sysinfo_item_t **psubtree)
 {
-        ASSERT(psubtree != NULL);
+        assert(psubtree != NULL);
         
         if (*psubtree == NULL) {
@@ -204 +205 @@
                 *psubtree =
                     (sysinfo_item_t *) slab_alloc(sysinfo_item_slab, 0);
-                ASSERT(*psubtree);
+                assert(*psubtree);
                 
                 /* Fill in item name up to the delimiter */
                 (*psubtree)->name = str_ndup(name, i);
-                ASSERT((*psubtree)->name);
+                assert((*psubtree)->name);
                 
                 /* Create subtree items */
@@ -268 +269 @@
                         sysinfo_item_t *item =
                             (sysinfo_item_t *) slab_alloc(sysinfo_item_slab, 0);
-                        ASSERT(item);
+                        assert(item);
                         
                         cur->next = item;
@@ -274 +275 @@
                         /* Fill in item name up to the delimiter */
                         item->name = str_ndup(name, i);
-                        ASSERT(item->name);
+                        assert(item->name);
                         
                         /* Create subtree items */
@@ -291 +292 @@
         
         /* Unreachable */
-        ASSERT(false);
+        assert(false);
         return NULL;
 }
@@ -649 +650 @@
         
         char *path = (char *) malloc(size + 1, 0);
-        ASSERT(path);
+        assert(path);
         
         if ((copy_from_uspace(path, ptr, size + 1) == 0) &&
@@ -760 +761 @@
         
         char *path = (char *) malloc(size + 1, 0);
-        ASSERT(path);
+        assert(path);
         
         if ((copy_from_uspace(path, ptr, size + 1) == 0) &&