===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/html.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -c -r1.49 -r1.50
*** src/usr.bin/mandoc/html.c	2014/10/27 16:28:30	1.49
--- src/usr.bin/mandoc/html.c	2014/10/28 17:35:42	1.50
***************
*** 1,4 ****
! /*	$OpenBSD: html.c,v 1.49 2014/10/27 16:28:30 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: html.c,v 1.50 2014/10/28 17:35:42 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 125,135 ****
  static	int	 print_encode(struct html *, const char *, int);
  static	void	 print_metaf(struct html *, enum mandoc_esc);
  static	void	 print_attr(struct html *, const char *, const char *);
- static	void	 *ml_alloc(char *);
  
  
! static void *
! ml_alloc(char *outopts)
  {
  	struct html	*h;
  	const char	*toks[5];
--- 125,134 ----
  static	int	 print_encode(struct html *, const char *, int);
  static	void	 print_metaf(struct html *, enum mandoc_esc);
  static	void	 print_attr(struct html *, const char *, const char *);
  
  
! void *
! html_alloc(const struct mchars *mchars, char *outopts)
  {
  	struct html	*h;
  	const char	*toks[5];
***************
*** 144,150 ****
  	h = mandoc_calloc(1, sizeof(struct html));
  
  	h->tags.head = NULL;
! 	h->symtab = mchars_alloc();
  
  	while (outopts && *outopts)
  		switch (getsubopt(&outopts, UNCONST(toks), &v)) {
--- 143,149 ----
  	h = mandoc_calloc(1, sizeof(struct html));
  
  	h->tags.head = NULL;
! 	h->symtab = mchars;
  
  	while (outopts && *outopts)
  		switch (getsubopt(&outopts, UNCONST(toks), &v)) {
***************
*** 167,186 ****
  	return(h);
  }
  
- void *
- html_alloc(char *outopts)
- {
- 
- 	return(ml_alloc(outopts));
- }
- 
- void *
- xhtml_alloc(char *outopts)
- {
- 
- 	return(ml_alloc(outopts));
- }
- 
  void
  html_free(void *p)
  {
--- 166,171 ----
***************
*** 193,201 ****
  		h->tags.head = tag->next;
  		free(tag);
  	}
- 
- 	if (h->symtab)
- 		mchars_free(h->symtab);
  
  	free(h);
  }
--- 178,183 ----