X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/0bd984429304da7c1c5509103e3dc04149028a95..e49a7995d5b388e644d60bfb3422252a686cabce:/trace.c

diff --git a/trace.c b/trace.c
index d5bdcb7..9e1cf0f 100644
--- a/trace.c
+++ b/trace.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: trace.c,v 1.3 1999/05/06 19:51:35 mdw Exp $
+ * $Id: trace.c,v 1.5 1999/10/22 22:39:52 mdw Exp $
  *
  * Tracing functions for debugging
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: trace.c,v $
+ * Revision 1.5  1999/10/22 22:39:52  mdw
+ * New documented interface for tracing.
+ *
+ * Revision 1.4  1999/05/19 20:27:11  mdw
+ * Change naming to match newer mLib conventions.
+ *
  * Revision 1.3  1999/05/06 19:51:35  mdw
  * Reformatted the LGPL notice a little bit.
  *
@@ -58,14 +64,14 @@
 
 /*----- Private state information -----------------------------------------*/
 
-static FILE *trace__fp = 0;		/* Where does debugging go? */
-static unsigned int trace__lvl = 0;	/* How much tracing gets done? */
+static FILE *tracefp = 0;		/* Where does debugging go? */
+static unsigned tracelvl = 0;		/* How much tracing gets done? */
 
 /*----- Functions provided ------------------------------------------------*/
 
 /* --- @trace@ --- *
  *
- * Arguments:	@unsigned int l@ = trace level for output
+ * Arguments:	@unsigned l@ = trace level for output
  *		@const char *f@ = a @printf@-style format string
  *		@...@ = other arguments
  *
@@ -74,22 +80,22 @@ static unsigned int trace__lvl = 0;	/* How much tracing gets done? */
  * Use:		Reports a message to the trace output.
  */
 
-void trace(unsigned int l, const char *f, ...)
+void trace(unsigned l, const char *f, ...)
 {
   va_list ap;
   if ((l & tracing()) == 0)
     return;
   va_start(ap, f);
-  fprintf(trace__fp, "*** %s: ", QUIS);
-  vfprintf(trace__fp, f, ap);
+  fprintf(tracefp, "*** %s: ", QUIS);
+  vfprintf(tracefp, f, ap);
   va_end(ap);
-  putc('\n', trace__fp);
-  fflush(trace__fp);
+  putc('\n', tracefp);
+  fflush(tracefp);
 }
 
 /* --- @trace_block@ --- *
  *
- * Arguments:	@unsigned int l@ = trace level for output
+ * Arguments:	@unsigned l@ = trace level for output
  *		@const char *s@ = some header string to write
  *		@const void *b@ = pointer to a block of memory to dump
  *		@size_t sz@ = size of the block of memory
@@ -99,7 +105,7 @@ void trace(unsigned int l, const char *f, ...)
  * Use:		Dumps the contents of a block to the trace output.
  */
 
-void trace_block(unsigned int l, const char *s, const void *b, size_t sz)
+void trace_block(unsigned l, const char *s, const void *b, size_t sz)
 {
   const unsigned char *p = b;
   size_t i;
@@ -113,59 +119,59 @@ void trace_block(unsigned int l, const char *s, const void *b, size_t sz)
 
   /* --- Now start work --- */
 
-  fprintf(trace__fp, "*** %s: %s\n", QUIS, s);
+  fprintf(tracefp, "*** %s: %s\n", QUIS, s);
 
   while (sz) {
-    fprintf(trace__fp, "*** %s:   %08lx : ", QUIS, o);
+    fprintf(tracefp, "*** %s:   %08lx : ", QUIS, o);
     for (i = 0; i < 8; i++) {
       if (i < sz)
-	fprintf(trace__fp, "%02x ", p[i]);
+	fprintf(tracefp, "%02x ", p[i]);
       else
-	fputs("** ", trace__fp);
+	fputs("** ", tracefp);
     }
-    fputs(": ", trace__fp);
+    fputs(": ", tracefp);
     for (i = 0; i < 8; i++) {
       if (i < sz)
-	fputc(isprint(p[i]) ? p[i] : '.', trace__fp);
+	fputc(isprint(p[i]) ? p[i] : '.', tracefp);
       else
-	fputc('*', trace__fp);
+	fputc('*', tracefp);
     }
-    fputc('\n', trace__fp);
+    fputc('\n', tracefp);
     c = (sz >= 8) ? 8 : sz;
     sz -= c, p += c, o += c;
   }
-  fflush(trace__fp);
+  fflush(tracefp);
 }
 
 /* --- @trace_on@ --- *
  *
  * Arguments:	@FILE *fp@ = a file to trace on
- *		@unsigned int l@ = trace level to set
+ *		@unsigned l@ = trace level to set
  *
  * Returns:	---
  *
  * Use:		Enables tracing to a file.
  */
 
-void trace_on(FILE *fp, unsigned int l)
+void trace_on(FILE *fp, unsigned l)
 {
-  trace__fp = fp;
-  if (!trace__lvl)
-    trace__lvl = l;
+  tracefp = fp;
+  if (!tracelvl)
+    tracelvl = l;
 }
 
 /* --- @trace_setLevel@ --- *
  *
- * Arguments:	@unsigned int l@ = trace level to set
+ * Arguments:	@unsigned l@ = trace level to set
  *
  * Returns:	---
  *
  * Use:		Sets the tracing level.
  */
 
-void trace_setLevel(unsigned int l)
+void trace_setLevel(unsigned l)
 {
-  trace__lvl = l;
+  tracelvl = l;
 }
 
 /* --- @tracing@ --- *
@@ -177,9 +183,9 @@ void trace_setLevel(unsigned int l)
  * Use:		Informs the caller whether tracing is enabled.
  */
 
-unsigned int tracing(void)
+unsigned tracing(void)
 {
-  return (trace__fp ? trace__lvl : 0u);
+  return (tracefp ? tracelvl : 0u);
 }
 
 /*----- That's all, folks -------------------------------------------------*/