===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/trace.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/m4/trace.c	2006/03/24 08:03:44	1.15
--- src/usr.bin/m4/trace.c	2010/09/07 19:58:09	1.16
***************
*** 1,4 ****
! /* $OpenBSD: trace.c,v 1.15 2006/03/24 08:03:44 espie Exp $ */
  /*
   * Copyright (c) 2001 Marc Espie.
   *
--- 1,4 ----
! /* $OpenBSD: trace.c,v 1.16 2010/09/07 19:58:09 marco Exp $ */
  /*
   * Copyright (c) 2001 Marc Espie.
   *
***************
*** 35,41 ****
  
  FILE *traceout;
  
! #define TRACE_ARGS 	1
  #define TRACE_EXPANSION 2
  #define TRACE_QUOTE	4
  #define TRACE_FILENAME	8
--- 35,41 ----
  
  FILE *traceout;
  
! #define TRACE_ARGS	1
  #define TRACE_EXPANSION 2
  #define TRACE_QUOTE	4
  #define TRACE_FILENAME	8
***************
*** 123,129 ****
  	int level;
  	int framep;
  
! 	for (framep = fp, level = 0; framep != 0; 
  		level++,framep = mstack[framep-3].sfra)
  		;
  	return level;
--- 123,129 ----
  	int level;
  	int framep;
  
! 	for (framep = fp, level = 0; framep != 0;
  		level++,framep = mstack[framep-3].sfra)
  		;
  	return level;
***************
*** 142,148 ****
  		fprintf(traceout, "id %lu: ", expansion_id);
  }
  
! size_t 
  trace(const char *argv[], int argc, struct input_file *inp)
  {
  	if (!traceout)
--- 142,148 ----
  		fprintf(traceout, "id %lu: ", expansion_id);
  }
  
! size_t
  trace(const char *argv[], int argc, struct input_file *inp)
  {
  	if (!traceout)
***************
*** 160,168 ****
  		delim[0] = LPAREN;
  		delim[1] = EOS;
  		for (i = 2; i < argc; i++) {
! 			fprintf(traceout, "%s%s%s%s", delim, 
! 			    (trace_flags & TRACE_QUOTE) ? lquote : "", 
! 			    argv[i], 
  			    (trace_flags & TRACE_QUOTE) ? rquote : "");
  			delim[0] = COMMA;
  			delim[1] = ' ';
--- 160,168 ----
  		delim[0] = LPAREN;
  		delim[1] = EOS;
  		for (i = 2; i < argc; i++) {
! 			fprintf(traceout, "%s%s%s%s", delim,
! 			    (trace_flags & TRACE_QUOTE) ? lquote : "",
! 			    argv[i],
  			    (trace_flags & TRACE_QUOTE) ? rquote : "");
  			delim[0] = COMMA;
  			delim[1] = ' ';
***************
*** 183,189 ****
  	}
  }
  
! void 
  finish_trace(size_t mark)
  {
  	fprintf(traceout, " -> ");
--- 183,189 ----
  	}
  }
  
! void
  finish_trace(size_t mark)
  {
  	fprintf(traceout, " -> ");