===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/file/magic-common.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/file/magic-common.c	2015/04/24 16:24:11	1.1
--- src/usr.bin/file/magic-common.c	2015/08/11 21:42:16	1.2
***************
*** 1,4 ****
! /* $OpenBSD: magic-common.c,v 1.1 2015/04/24 16:24:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
--- 1,4 ----
! /* $OpenBSD: magic-common.c,v 1.2 2015/08/11 21:42:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
***************
*** 63,83 ****
  }
  
  void
! magic_warn(struct magic_line *ml, const char *fmt, ...)
  {
- 	va_list	 ap;
  	char	*msg;
  
! 	if (!ml->root->warnings)
  		return;
  
! 	va_start(ap, fmt);
! 	if (vasprintf(&msg, fmt, ap) == -1) {
! 		va_end(ap);
  		return;
! 	}
  	va_end(ap);
  
! 	fprintf(stderr, "%s:%u: %s\n", ml->root->path, ml->line, msg);
! 	free(msg);
  }
--- 63,97 ----
  }
  
  void
! magic_vwarnm(struct magic *m, u_int line, const char *fmt, va_list ap)
  {
  	char	*msg;
  
! 	if (!m->warnings)
  		return;
  
! 	if (vasprintf(&msg, fmt, ap) == -1)
  		return;
! 	fprintf(stderr, "%s:%u: %s\n", m->path, line, msg);
! 	free(msg);
! }
! 
! void
! magic_warnm(struct magic *m, u_int line, const char *fmt, ...)
! {
! 	va_list	 ap;
! 
! 	va_start(ap, fmt);
! 	magic_vwarnm (m, line, fmt, ap);
  	va_end(ap);
+ }
  
! void
! magic_warn(struct magic_line *ml, const char *fmt, ...)
! {
! 	va_list	 ap;
! 
! 	va_start(ap, fmt);
! 	magic_vwarnm (ml->root, ml->line, fmt, ap);
! 	va_end(ap);
  }