--- libwww/Library/src/HTDescpt.c	1999/02/19 23:09:35	2.18
+++ libwww/Library/src/HTDescpt.c	1999/02/22 22:10:11	2.19
@@ -3,7 +3,7 @@
 **
 **	(c) COPYRIGHT MIT 1995.
 **	Please first read the full copyright statement in the file COPYRIGH.
-**	@(#) $Id: HTDescpt.c,v 2.18 1999/02/19 23:09:35 frystyk Exp $
+**	@(#) $Id: HTDescpt.c,v 2.19 1999/02/22 22:10:11 frystyk Exp $
 **
 ** Authors:
 **	AL	Ari Luotonen <luotonen@dxcern.cern.ch>
@@ -47,13 +47,11 @@ PUBLIC HTList * HTReadDescriptions (char
     sprintf(name, "%s/%s", dirname, HTDescriptionFile);
     fp = fopen(name, "r");
     if (!fp) {
-	if (PROT_TRACE)
-	    HTTrace("DirBrowse... No description file %s\n", name);
+	HTTRACE(PROT_TRACE, "DirBrowse... No description file %s\n" _ name);
 	HT_FREE(name);
 	return NULL;
     } else {
-	if (PROT_TRACE)
-	    HTTrace("DirBrowse... Description file found %s\n", name);
+	HTTRACE(PROT_TRACE, "DirBrowse... Description file found %s\n" _ name);
     }
 
     list = HTList_new();
@@ -89,8 +87,7 @@ PUBLIC HTList * HTReadDescriptions (char
 	        HT_OUTOFMEM("HTDirReadDescriptions");
 	    sprintf(stuff, "%s %s", t, d);
 	    HTList_addObject(list, (void*)stuff);
-	    if (PROT_TRACE)
-		HTTrace("Description. %s\n", stuff);
+	    HTTRACE(PROT_TRACE, "Description. %s\n" _ stuff);
 	}
     }
     fclose(fp);
@@ -128,9 +125,8 @@ PRIVATE char * HTPeekTitle (char * dirna
 
     HT_FREE(ret);	/* from previous call */
 
-    if (PROT_TRACE)
-	HTTrace("HTPeekTitle. called, dirname=%s filename=%s\n",
-		dirname ? dirname : "-null-",
+    HTTRACE(PROT_TRACE, "HTPeekTitle. called, dirname=%s filename=%s\n" _ 
+		dirname ? dirname : "-null-" _ 
 		filename ? filename : "-null-");
 
     if (!dirname || !filename) return NULL;
@@ -141,8 +137,7 @@ PRIVATE char * HTPeekTitle (char * dirna
 
     fp = fopen(name, "r");
     if (!fp) {
-	if (PROT_TRACE)
-	    HTTrace("HTPeekTitle. fopen failed\n");
+	HTTRACE(PROT_TRACE, "HTPeekTitle. fopen failed\n");
 	goto cleanup;
     }
 
@@ -181,9 +176,8 @@ PRIVATE char * HTPeekTitle (char * dirna
     }
 
   cleanup:
-    if (PROT_TRACE)
-	HTTrace("HTPeekTitle. returning %c%s%c\n",
-		ret ? '"' : '-',  ret ? ret : "null",  ret ? '"' : '-');
+    HTTRACE(PROT_TRACE, "HTPeekTitle. returning %c%s%c\n" _ 
+	    ret ? '"' : '-' _ ret ? ret : "null" _ ret ? '"' : '-');
     HT_FREE(name);
     return ret;
 }