Changes in uspace/lib/c/generic/malloc.c [33b8d024:582a0b8] 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;
 
-#define malloc_assert(expr) safe_assert(expr)
+#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 */
+
 
 #ifdef FUTEX_UPGRADABLE
@@ -396 +411 @@
         
         /* Resize the address space area */
-        errno_t ret = as_area_resize(area->start, asize, 0);
+        int ret = as_area_resize(area->start, asize, 0);
         if (ret != EOK)
                 return false;
@@ -489 +504 @@
                         
                         /* Resize the address space area */
-                        errno_t ret = as_area_resize(area->start, asize, 0);
+                        int ret = as_area_resize(area->start, asize, 0);
                         if (ret != EOK)
                                 abort();
@@ -874 +889 @@
  *
  */
-void *realloc(void * const addr, const size_t size)
-{
-        if (size == 0) {
-                free(addr);
-                return NULL;
-        }
-
+void *realloc(const void *addr, const size_t size)
+{
         if (addr == NULL)
                 return malloc(size);
@@ -988 +998 @@
  *
  */
-void free(void * const addr)
+void free(const void *addr)
 {
         if (addr == NULL)