From owner-svn-src-head@freebsd.org  Tue Oct 18 13:38:01 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 321B5C16792;
 Tue, 18 Oct 2016 13:38:01 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0411C25E;
 Tue, 18 Oct 2016 13:38:00 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9IDc0EG001802;
 Tue, 18 Oct 2016 13:38:00 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9IDc0e1001801;
 Tue, 18 Oct 2016 13:38:00 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201610181338.u9IDc0e1001801@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 18 Oct 2016 13:38:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r307564 - head/contrib/mdocml
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Oct 2016 13:38:01 -0000

Author: emaste
Date: Tue Oct 18 13:37:59 2016
New Revision: 307564
URL: https://svnweb.freebsd.org/changeset/base/307564

Log:
  makewhatis: avoid skipping another page after one with no mlinks
  
  Submitted by:	Ingo Schwarze
  MFC after:	3 weeks
  MFC with:	r307003

Modified:
  head/contrib/mdocml/mandocdb.c

Modified: head/contrib/mdocml/mandocdb.c
==============================================================================
--- head/contrib/mdocml/mandocdb.c	Tue Oct 18 13:29:30 2016	(r307563)
+++ head/contrib/mdocml/mandocdb.c	Tue Oct 18 13:37:59 2016	(r307564)
@@ -1146,10 +1146,8 @@ mpages_merge(struct mparse *mp)
 
 	for (mpage = mpage_head; mpage != NULL; mpage = mpage->next) {
 		mlinks_undupe(mpage);
-		if ((mlink = mpage->mlinks) == NULL) {
-			mpage = mpage->next;
+		if ((mlink = mpage->mlinks) == NULL)
 			continue;
-		}
 
 		name_mask = NAME_MASK;
 		mandoc_ohash_init(&names, 4, offsetof(struct str, key));