===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -c -r1.61 -r1.62
*** src/usr.bin/mandoc/mandocdb.c	2014/01/06 03:52:05	1.61
--- src/usr.bin/mandoc/mandocdb.c	2014/01/06 13:54:11	1.62
***************
*** 1,4 ****
! /*	$Id: mandocdb.c,v 1.61 2014/01/06 03:52:05 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mandocdb.c,v 1.62 2014/01/06 13:54:11 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 122,128 ****
  };
  
  static	void	 dbclose(int);
! static	void	 dbindex(const struct mpage *, struct mchars *);
  static	int	 dbopen(int);
  static	void	 dbprune(void);
  static	void	 filescan(const char *);
--- 122,128 ----
  };
  
  static	void	 dbclose(int);
! static	void	 dbadd(const struct mpage *, struct mchars *);
  static	int	 dbopen(int);
  static	void	 dbprune(void);
  static	void	 filescan(const char *);
***************
*** 1039,1045 ****
  		else
  			parse_cat(mpage);
  
! 		dbindex(mpage, mc);
  		ohash_delete(&strings);
  		mpage = ohash_next(&mpages, &pslot);
  	}
--- 1039,1045 ----
  		else
  			parse_cat(mpage);
  
! 		dbadd(mpage, mc);
  		ohash_delete(&strings);
  		mpage = ohash_next(&mpages, &pslot);
  	}
***************
*** 1724,1730 ****
   * Also, handle escape sequences at the last possible moment.
   */
  static void
! dbindex(const struct mpage *mpage, struct mchars *mc)
  {
  	struct mlink	*mlink;
  	struct str	*key;
--- 1724,1730 ----
   * Also, handle escape sequences at the last possible moment.
   */
  static void
! dbadd(const struct mpage *mpage, struct mchars *mc)
  {
  	struct mlink	*mlink;
  	struct str	*key;
***************
*** 1733,1739 ****
  	unsigned int	 slot;
  
  	if (verb)
! 		say(mpage->mlinks->file, "Adding to index");
  
  	if (nodb)
  		return;
--- 1733,1739 ----
  	unsigned int	 slot;
  
  	if (verb)
! 		say(mpage->mlinks->file, "Adding to database");
  
  	if (nodb)
  		return;
***************
*** 1794,1800 ****
  		SQL_STEP(stmts[STMT_DELETE_PAGE]);
  		sqlite3_reset(stmts[STMT_DELETE_PAGE]);
  		if (verb)
! 			say(mlink->file, "Deleted from index");
  		mpage = ohash_next(&mpages, &slot);
  	}
  }
--- 1794,1800 ----
  		SQL_STEP(stmts[STMT_DELETE_PAGE]);
  		sqlite3_reset(stmts[STMT_DELETE_PAGE]);
  		if (verb)
! 			say(mlink->file, "Deleted from database");
  		mpage = ohash_next(&mpages, &slot);
  	}
  }