Changes in kernel/generic/src/sysinfo/sysinfo.c [abf6c01:bab75df6] in mainline

File:

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

kernel/generic/src/sysinfo/sysinfo.c

@@ -204 +204 @@
 
                 *psubtree =
-                    (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, FRAME_ATOMIC);
-                if (!*psubtree)
-                        return NULL;
+                    (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0);
+                assert(*psubtree);
 
                 /* Fill in item name up to the delimiter */
                 (*psubtree)->name = str_ndup(name, i);
-                if (!(*psubtree)->name) {
-                        slab_free(sysinfo_item_cache, *psubtree);
-                        return NULL;
-                }
+                assert((*psubtree)->name);
 
                 /* Create subtree items */
                 if (name[i] == '.') {
                         (*psubtree)->subtree_type = SYSINFO_SUBTREE_TABLE;
-                        sysinfo_item_t *item = sysinfo_create_path(name + i + 1,
+                        return sysinfo_create_path(name + i + 1,
                             &((*psubtree)->subtree.table));
-                        if (!item) {
-                                free((*psubtree)->name);
-                                slab_free(sysinfo_item_cache, *psubtree);
-                        }
-                        return item;
                 }
 
@@ -280 +271 @@
 
                         sysinfo_item_t *item =
-                            (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, FRAME_ATOMIC);
-                        if (!item)
-                                return NULL;
+                            (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0);
+                        assert(item);
 
                         cur->next = item;
@@ -288 +278 @@
                         /* Fill in item name up to the delimiter */
                         item->name = str_ndup(name, i);
-                        if (!item->name) {
-                                slab_free(sysinfo_item_cache, item);
-                                return NULL;
-                        }
+                        assert(item->name);
 
                         /* Create subtree items */
                         if (name[i] == '.') {
                                 item->subtree_type = SYSINFO_SUBTREE_TABLE;
-                                sysinfo_item_t *sub = sysinfo_create_path(
-                                    name + i + 1, &(item->subtree.table));
-                                if (!sub) {
-                                        free(item->name);
-                                        slab_free(sysinfo_item_cache, item);
-                                        return NULL;
-                                }
-                                return sub;
+                                return sysinfo_create_path(name + i + 1,
+                                    &(item->subtree.table));
                         }
 
@@ -313 +294 @@
         }
 
-        unreachable();
+        /* Unreachable */
+        assert(false);
+        return NULL;
 }
 
@@ -337 +320 @@
                 item->val_type = SYSINFO_VAL_VAL;
                 item->val.val = val;
-        } else {
-                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -371 +352 @@
                 item->val.data.data = data;
                 item->val.data.size = size;
-        } else {
-                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -401 +380 @@
                 item->val.gen_val.fn = fn;
                 item->val.gen_val.data = data;
-        } else {
-                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -436 +413 @@
                 item->val.gen_data.fn = fn;
                 item->val.gen_data.data = data;
-        } else {
-                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -461 +436 @@
         if (item != NULL)
                 item->val_type = SYSINFO_VAL_UNDEFINED;
-        else
-                printf("Could not set sysinfo item %s.\n", name);
 
         mutex_unlock(&sysinfo_lock);
@@ -495 +468 @@
                 item->subtree.generator.fn = fn;
                 item->subtree.generator.data = data;
-        } else {
-                printf("Could not set sysinfo item %s.\n", name);
         }
 
@@ -685 +656 @@
                 return ret;
 
-        // TODO: Change this so that allocation is not needed.
-        char *path = malloc(size + 1);
-        if (!path)
-                return ret;
+        char *path = (char *) nfmalloc(size + 1);
+        assert(path);
 
         if ((copy_from_uspace(path, ptr, size + 1) == 0) &&
@@ -796 +765 @@
                 return ret;
 
-        // TODO: Change this so that allocation is not needed.
-        char *path = malloc(size + 1);
-        if (!path)
-                return ret;
+        char *path = (char *) nfmalloc(size + 1);
+        assert(path);
 
         if ((copy_from_uspace(path, ptr, size + 1) == 0) &&