===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mansearch.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -c -r1.11 -r1.12
*** src/usr.bin/mandoc/mansearch.h	2014/07/24 20:30:38	1.11
--- src/usr.bin/mandoc/mansearch.h	2014/08/27 00:06:08	1.12
***************
*** 1,4 ****
! /*	$Id: mansearch.h,v 1.11 2014/07/24 20:30:38 schwarze Exp $ */
  /*
   * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mansearch.h,v 1.12 2014/08/27 00:06:08 schwarze Exp $ */
  /*
   * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 68,74 ****
  #define	NAME_HEAD	 0x0000004000000010ULL
  #define	NAME_MASK	 0x000000000000001fULL
  
! __BEGIN_DECLS
  
  struct	manpage {
  	char		*file; /* to be prefixed by manpath */
--- 68,79 ----
  #define	NAME_HEAD	 0x0000004000000010ULL
  #define	NAME_MASK	 0x000000000000001fULL
  
! enum	argmode {
! 	ARG_FILE = 0,
! 	ARG_NAME,
! 	ARG_WORD,
! 	ARG_EXPR
! };
  
  struct	manpage {
  	char		*file; /* to be prefixed by manpath */
***************
*** 81,101 ****
  struct	mansearch {
  	const char	*arch; /* architecture/NULL */
  	const char	*sec; /* mansection/NULL */
! 	uint64_t	 deftype; /* type if no key  */
! 	int		 flags;
! #define	MANSEARCH_WHATIS 0x01 /* whatis(1) mode: whole words, no keys */
! #define	MANSEARCH_MAN    0x02 /* man(1) mode: string equality, no keys */
  };
  
  int	mansearch_setup(int);
  int	mansearch(const struct mansearch *cfg, /* options */
  		const struct manpaths *paths, /* manpaths */
  		int argc, /* size of argv */
  		char *argv[],  /* search terms */
- 		const char *outkey, /* name of additional output key */
  		struct manpage **res, /* results */
  		size_t *ressz); /* results returned */
  
  __END_DECLS
  
! #endif /*!MANSEARCH_H*/
--- 86,106 ----
  struct	mansearch {
  	const char	*arch; /* architecture/NULL */
  	const char	*sec; /* mansection/NULL */
! 	const char	*outkey; /* show content of this macro */
! 	enum argmode	 argmode; /* interpretation of arguments */
  };
  
+ __BEGIN_DECLS
+ 
  int	mansearch_setup(int);
  int	mansearch(const struct mansearch *cfg, /* options */
  		const struct manpaths *paths, /* manpaths */
  		int argc, /* size of argv */
  		char *argv[],  /* search terms */
  		struct manpage **res, /* results */
  		size_t *ressz); /* results returned */
+ void	mansearch_free(struct manpage *, size_t);
  
  __END_DECLS
  
! #endif /* MANSEARCH_H */