===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/trace.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/m4/trace.c	2002/04/26 13:12:33	1.5
--- src/usr.bin/m4/trace.c	2002/04/26 16:15:16	1.6
***************
*** 1,4 ****
! /* $OpenBSD: trace.c,v 1.5 2002/04/26 13:12:33 espie Exp $ */
  /*
   * Copyright (c) 2001 Marc Espie.
   *
--- 1,4 ----
! /* $OpenBSD: trace.c,v 1.6 2002/04/26 16:15:16 espie Exp $ */
  /*
   * Copyright (c) 2001 Marc Espie.
   *
***************
*** 62,69 ****
  static unsigned int flags = TRACE_QUOTE | TRACE_EXPANSION;
  
  static struct t *
! find_trace_entry(name)
! 	const char *name;
  {
  	struct t *n;
  
--- 62,68 ----
  static unsigned int flags = TRACE_QUOTE | TRACE_EXPANSION;
  
  static struct t *
! find_trace_entry(const char *name)
  {
  	struct t *n;
  
***************
*** 75,83 ****
  
  
  void
! mark_traced(name, on)
! 	const char *name;
! 	int on;
  {
  	struct t *n, *n2;
  
--- 74,80 ----
  
  
  void
! mark_traced(const char *name, int on)
  {
  	struct t *n, *n2;
  
***************
*** 109,116 ****
  }
  
  int 
! is_traced(name)
! 	const char *name;
  {
  	struct t *n;
  
--- 106,112 ----
  }
  
  int 
! is_traced(const char *name)
  {
  	struct t *n;
  
***************
*** 121,128 ****
  }
  
  void
! trace_file(name)
! 	const char *name;
  {
  
  	if (traceout != stderr)
--- 117,123 ----
  }
  
  void
! trace_file(const char *name)
  {
  
  	if (traceout != stderr)
***************
*** 133,140 ****
  }
  
  static unsigned int
! letter_to_flag(c)
! 	int c;
  {
  	switch(c) {
  	case 'a':
--- 128,134 ----
  }
  
  static unsigned int
! letter_to_flag(int c)
  {
  	switch(c) {
  	case 'a':
***************
*** 165,172 ****
  }
  
  void
! set_trace_flags(s)
! 	const char *s;
  {
  	char mode = 0;
  	unsigned int f = 0;
--- 159,165 ----
  }
  
  void
! set_trace_flags(const char *s)
  {
  	char mode = 0;
  	unsigned int f = 0;
***************
*** 203,210 ****
  }
  
  static void
! print_header(inp)
! 	struct input_file *inp;
  {
  	fprintf(traceout, "m4trace:");
  	if (flags & TRACE_FILENAME)
--- 196,202 ----
  }
  
  static void
! print_header(struct input_file *inp)
  {
  	fprintf(traceout, "m4trace:");
  	if (flags & TRACE_FILENAME)
***************
*** 217,226 ****
  }
  
  ssize_t 
! trace(argv, argc, inp)
! 	const char **argv;
! 	int argc;
! 	struct input_file *inp;
  {
  	print_header(inp);
  	if (flags & TRACE_CONT) {
--- 209,215 ----
  }
  
  ssize_t 
! trace(const char *argv[], int argc, struct input_file *inp)
  {
  	print_header(inp);
  	if (flags & TRACE_CONT) {
***************
*** 259,266 ****
  }
  
  void 
! finish_trace(mark)
! size_t mark;
  {
  	fprintf(traceout, " -> ");
  	if (flags & TRACE_QUOTE)
--- 248,254 ----
  }
  
  void 
! finish_trace(size_t mark)
  {
  	fprintf(traceout, " -> ");
  	if (flags & TRACE_QUOTE)