Changeset 2905 for trunk/libc/src/kNIX/heap.c

Timestamp:

Dec 26, 2006, 1:24:25 AM (19 years ago)

Author:

bird

Message:

hacking.

File:

• trunk/libc/src/kNIX/heap.c (modified) (5 diffs)

trunk/libc/src/kNIX/heap.c

@@ -30 +30 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#define  __LIBC_LOG_GROUP __LIBC_LOG_GRP_HEAP
 #include "kNIX.h"
-#ifdef __OS2__
-# define INCL_DOSERRORS
-# define INCL_FSMACROS
-# define INCL_EXAPIS
-# include <os2emx.h>
-#endif
-#ifdef __NT__
-# include <klibc/nt/nt.h>
-#endif
-#include <errno.h>
-#include <klibc/backend.h>
+#define __LIBC_LOG_GROUP __LIBC_LOG_GRP_HEAP
 #include <klibc/logstrict.h>
-
 
 
@@ -55 +43 @@
     FS_VAR_SAVE_LOAD();
     int rc = DosFreeMemEx((void *)ObjPtr);
-    LIBC_ASSERTM(!rc, vs"ObjPtr=%p rc=%d\n", ObjPtr, rc); (void)rc;
+    LIBC_ASSERTM(!rc, "ObjPtr=%tx rc=%d\n", ObjPtr, rc); (void)rc;
     FS_RESTORE();
 
@@ -243 +231 @@
 void *__libc_back_heapExpandBy(uintptr_t incr, __LIBCSBRKMODEL enmSBrkModel)
 {
-    LIBCLOG_ENTER("incr=%p enmSBrkModel=%d\n", incr, enmSBrkModel);
+    LIBCLOG_ENTER("incr=%tx enmSBrkModel=%d\n", incr, enmSBrkModel);
     const unsigned old_obj_count = __libc_back_gcHeapObjs;
 
@@ -353 +341 @@
 void *__libc_back_heapShrinkTo(uintptr_t new_brk)
 {
-    LIBCLOG_ENTER("new_brk=%ld\n", new_brk);
+    LIBCLOG_ENTER("new_brk=%tx\n", new_brk);
 
     /*
@@ -448 +436 @@
 void *__libc_back_heapShrinkBy(uintptr_t decr, __LIBCSBRKMODEL enmSBrkModel)
 {
-    LIBCLOG_ENTER("decr=%ld enmSBrkModel=%d\n", decr, enmSBrkModel);
+    LIBCLOG_ENTER("decr=%tx enmSBrkModel=%d\n", decr, enmSBrkModel);
     if (    __libc_back_gcHeapObjs != 0
         &&  __libc_back_gpHeapTopObj->brk - decr >= __libc_back_gpHeapTopObj->base)