===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mansearch.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/mandoc/mansearch.c	2014/07/24 20:30:38	1.29
--- src/usr.bin/mandoc/mansearch.c	2014/08/08 17:36:21	1.30
***************
*** 1,4 ****
! /*	$Id: mansearch.c,v 1.29 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 ----
! /*	$Id: mansearch.c,v 1.30 2014/08/08 17:36:21 schwarze Exp $ */
  /*
   * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 291,297 ****
  			mp->pageid = pageid;
  			mp->form = sqlite3_column_int(s, 1);
  			if (TYPE_Nd == outbit)
! 				mp->desc = mandoc_strdup(
  				    sqlite3_column_text(s, 0));
  			ohash_insert(&htab, idx, mp);
  		}
--- 291,297 ----
  			mp->pageid = pageid;
  			mp->form = sqlite3_column_int(s, 1);
  			if (TYPE_Nd == outbit)
! 				mp->desc = mandoc_strdup((const char *)
  				    sqlite3_column_text(s, 0));
  			ohash_insert(&htab, idx, mp);
  		}
***************
*** 395,403 ****
  
  		/* Fetch the next name. */
  
! 		sec = sqlite3_column_text(s, 0);
! 		arch = sqlite3_column_text(s, 1);
! 		name = sqlite3_column_text(s, 2);
  
  		/* Remember the first section found. */
  
--- 395,403 ----
  
  		/* Fetch the next name. */
  
! 		sec = (const char *)sqlite3_column_text(s, 0);
! 		arch = (const char *)sqlite3_column_text(s, 1);
! 		name = (const char *)sqlite3_column_text(s, 2);
  
  		/* Remember the first section found. */
  
***************
*** 486,492 ****
  			oldoutput = output;
  			sep1 = " # ";
  		}
! 		data = sqlite3_column_text(s, 1);
  		mandoc_asprintf(&newoutput, "%s%s%s",
  		    oldoutput, sep1, data);
  		free(output);
--- 486,492 ----
  			oldoutput = output;
  			sep1 = " # ";
  		}
! 		data = (const char *)sqlite3_column_text(s, 1);
  		mandoc_asprintf(&newoutput, "%s%s%s",
  		    oldoutput, sep1, data);
  		free(output);