===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/manpath.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/mandoc/manpath.c	2011/12/12 01:59:13	1.2
--- src/usr.bin/mandoc/manpath.c	2011/12/19 02:26:33	1.3
***************
*** 1,4 ****
! /*	$Id: manpath.c,v 1.2 2011/12/12 01:59:13 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
--- 1,4 ----
! /*	$Id: manpath.c,v 1.3 2011/12/19 02:26:33 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
***************
*** 16,22 ****
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
! #include <sys/types.h>
  #include <assert.h>
  #include <ctype.h>
  #include <limits.h>
--- 16,23 ----
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
  
! #include <sys/param.h>
! 
  #include <assert.h>
  #include <ctype.h>
  #include <limits.h>
***************
*** 31,36 ****
--- 32,38 ----
  #define MAN_CONF_KEY	"_whatdb"
  
  static	void	 manpath_add(struct manpaths *, const char *);
+ static	void	 manpath_parseline(struct manpaths *, char *);
  
  void
  manpath_parse(struct manpaths *dirs, const char *file,
***************
*** 43,49 ****
  		defp = getenv("MANPATH");
  
  	if (NULL == defp)
! 		manpath_parseconf(dirs, file);
  	else
  		manpath_parseline(dirs, defp);
  }
--- 45,51 ----
  		defp = getenv("MANPATH");
  
  	if (NULL == defp)
! 		manpath_manconf(dirs, file ? file : MAN_CONF_FILE);
  	else
  		manpath_parseline(dirs, defp);
  }
***************
*** 51,57 ****
  /*
   * Parse a FULL pathname from a colon-separated list of arrays.
   */
! void
  manpath_parseline(struct manpaths *dirs, char *path)
  {
  	char	*dir;
--- 53,59 ----
  /*
   * Parse a FULL pathname from a colon-separated list of arrays.
   */
! static void
  manpath_parseline(struct manpaths *dirs, char *path)
  {
  	char	*dir;
***************
*** 86,98 ****
  		 ((size_t)dirs->sz + 1) * sizeof(char *));
  
  	dirs->paths[dirs->sz++] = mandoc_strdup(cp);
- }
- 
- void
- manpath_parseconf(struct manpaths *dirs, const char *file)
- {
- 
- 	manpath_manconf(dirs, file ? file : MAN_CONF_FILE);
  }
  
  void
--- 88,93 ----