--- libwww/Library/src/HTMemory.c	1998/05/04 19:36:58	2.9
+++ libwww/Library/src/HTMemory.c	1999/02/22 22:10:11	2.10
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTMemory.c,v 2.9 1998/05/04 19:36:58 frystyk Exp $
+**	@(#) $Id: HTMemory.c,v 2.10 1999/02/22 22:10:11 frystyk Exp $
 **
 ** History:
 **	 8 Feb 95	Written by Eric and Henrik
@@ -29,7 +29,7 @@ PRIVATE size_t LastAllocSize = 0;		  /*
 */
 PUBLIC BOOL HTMemoryCall_add (HTMemoryCallback * cbf)
 {
-    if (MEM_TRACE) HTTrace("Mem Add..... Callback %p\n", (void *) cbf);
+    HTTRACE(MEM_TRACE, "Mem Add..... Callback %p\n" _ (void *) cbf);
     if (!HTMemCall) HTMemCall = HTList_new();
     return cbf ? HTList_addObject(HTMemCall, (void *) cbf) : NO;
 }
@@ -40,7 +40,7 @@ PUBLIC BOOL HTMemoryCall_add (HTMemoryCa
 */
 PUBLIC BOOL HTMemoryCall_delete (HTMemoryCallback * cbf)
 {
-    if (MEM_TRACE) HTTrace("Mem Delete.. Callback %p\n", (void *) cbf);
+    HTTRACE(MEM_TRACE, "Mem Delete.. Callback %p\n" _ (void *) cbf);
     return (HTMemCall && cbf) ? HTList_removeObject(HTMemCall,(void*)cbf) : NO;
 }
 
@@ -50,7 +50,7 @@ PUBLIC BOOL HTMemoryCall_delete (HTMemor
 */
 PUBLIC BOOL HTMemoryCall_deleteAll (void)
 {
-    if (MEM_TRACE) HTTrace("Mem Delete.. All Callback functions\n");
+    HTTRACE(MEM_TRACE, "Mem Delete.. All Callback functions\n");
     if (HTMemCall) {
 	HTList_delete(HTMemCall);
 	HTMemCall = NULL;
@@ -70,14 +70,12 @@ PUBLIC void * HTMemory_malloc (size_t si
     if (HTMemCall) {
 	HTMemoryCallback * pres;
 	while ((pres = (HTMemoryCallback *) HTList_nextObject(HTMemCall))) {
-	    if (MEM_TRACE)
-		HTTrace("Mem Calling. %p (size %d)\n",(void*)pres,size);
+	    HTTRACE(MEM_TRACE, "Mem Calling. %p (size %d)\n" _ (void*)pres _ size);
 	    (*pres)(size);
 	    if ((ptr = malloc(size)) != NULL) return ptr;
 	}
     }
-    if (MEM_TRACE)
-	HTTrace("Memory.... Couldn't allocate %d bytes\n", size);
+    HTTRACE(MEM_TRACE, "Memory.... Couldn't allocate %d bytes\n" _ size);
     return NULL;
 }
 
@@ -93,15 +91,14 @@ PUBLIC void * HTMemory_calloc (size_t no
 	HTMemoryCallback * pres;
 	size_t total = size * nobj;
 	while ((pres = (HTMemoryCallback *) HTList_nextObject(HTMemCall))) {
-	    if (MEM_TRACE) HTTrace("Mem Calling. %p (size %d)\n",
-				   (void *) pres, total);
+	    HTTRACE(MEM_TRACE, "Mem Calling. %p (size %d)\n" _ 
+				   (void *) pres _ total);
 	    (*pres)(total);
 	    if ((ptr = calloc(nobj, size)) != NULL) return ptr;
 	}
     }
-    if (MEM_TRACE)
-	HTTrace("Memory...... Couldn't allocate %d objects of size %d\n",
-		 nobj, size);
+    HTTRACE(MEM_TRACE, "Memory...... Couldn't allocate %d objects of size %d\n" _ 
+		 nobj _ size);
     return NULL;
 }
 
@@ -116,14 +113,12 @@ PUBLIC void * HTMemory_realloc (void * p
     if (HTMemCall) {
 	HTMemoryCallback * pres;
 	while ((pres = (HTMemoryCallback *) HTList_nextObject(HTMemCall))) {
-	    if (MEM_TRACE)
-		HTTrace("Mem Calling. %p (size %d)\n",(void*)pres,size);
+	    HTTRACE(MEM_TRACE, "Mem Calling. %p (size %d)\n" _ (void*)pres _ size);
 	    (*pres)(size);
 	    if ((ptr = realloc(p, size)) != NULL) return ptr;
 	}
     }
-    if (MEM_TRACE)
-	HTTrace("Memory...... Couldn't reallocate %d bytes\n", size);
+    HTTRACE(MEM_TRACE, "Memory...... Couldn't reallocate %d bytes\n" _ size);
     return NULL;
 }
 
@@ -133,7 +128,7 @@ PUBLIC void * HTMemory_realloc (void * p
 PUBLIC void HTMemory_free (void * ptr)
 {
     if (ptr) {
-	if (MEM_TRACE) HTTrace("Memory Free. %p\n", ptr);
+	HTTRACE(MEM_TRACE, "Memory Free. %p\n" _ ptr);
 	free(ptr);
     }
 }
@@ -166,9 +161,8 @@ PUBLIC void HTMemory_outofmem (char * na
 {
     if (PExit)
 	(*PExit)(name, file, line);
-    HTTrace("%s:%ld failed allocation for \"%s\" (%ld bytes).\n\
-Program aborted.\n",
-	     file, line, name, LastAllocSize);
+    HTTRACE(ALL_TRACE, "%s:%ld failed allocation for \"%s\" (%ld bytes).\nProgram aborted.\n" _
+	    file _ line _ name _ LastAllocSize);
     abort();
 }