Changes in kernel/generic/src/sysinfo/sysinfo.c [68f4671:2a08005] in mainline

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (11 diffs)

kernel/generic/src/sysinfo/sysinfo.c

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