Changes in uspace/lib/c/generic/malloc.c [582a0b8:33b8d024] in mainline

File:

• uspace/lib/c/generic/malloc.c (modified) (5 diffs)

uspace/lib/c/generic/malloc.c

@@ -196 +196 @@
 static futex_t malloc_futex = FUTEX_INITIALIZER;
 
-#ifndef NDEBUG
-
-#define malloc_assert(expr) \
-        do { \
-                if (!(expr)) {\
-                        heap_unlock(); \
-                        assert_abort(#expr, __FILE__, __LINE__); \
-                } \
-        } while (0)
-
-#else /* NDEBUG */
-
-#define malloc_assert(expr)
-
-#endif /* NDEBUG */
-
+#define malloc_assert(expr) safe_assert(expr)
 
 #ifdef FUTEX_UPGRADABLE
@@ -411 +396 @@
         
         /* Resize the address space area */
-        int ret = as_area_resize(area->start, asize, 0);
+        errno_t ret = as_area_resize(area->start, asize, 0);
         if (ret != EOK)
                 return false;
@@ -504 +489 @@
                         
                         /* Resize the address space area */
-                        int ret = as_area_resize(area->start, asize, 0);
+                        errno_t ret = as_area_resize(area->start, asize, 0);
                         if (ret != EOK)
                                 abort();
@@ -889 +874 @@
  *
  */
-void *realloc(const void *addr, const size_t size)
-{
+void *realloc(void * const addr, const size_t size)
+{
+        if (size == 0) {
+                free(addr);
+                return NULL;
+        }
+
         if (addr == NULL)
                 return malloc(size);
@@ -998 +988 @@
  *
  */
-void free(const void *addr)
+void free(void * const addr)
 {
         if (addr == NULL)