From owner-svn-src-head@freebsd.org  Tue Jul 18 21:09:31 2017
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 2DC91DA021E;
 Tue, 18 Jul 2017 21:09:31 +0000 (UTC) (envelope-from jhb@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 DF68683C37;
 Tue, 18 Jul 2017 21:09:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6IL9Uw0048271;
 Tue, 18 Jul 2017 21:09:30 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6IL9Ur2048270;
 Tue, 18 Jul 2017 21:09:30 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201707182109.v6IL9Ur2048270@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 18 Jul 2017 21:09:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321176 - head/lib/libsysdecode
X-SVN-Group: head
X-SVN-Commit-Author: jhb
X-SVN-Commit-Paths: head/lib/libsysdecode
X-SVN-Commit-Revision: 321176
X-SVN-Commit-Repository: base
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 Jul 2017 21:09:31 -0000

Author: jhb
Date: Tue Jul 18 21:09:29 2017
New Revision: 321176
URL: https://svnweb.freebsd.org/changeset/base/321176

Log:
  Remove special handling for 'disk*.h'
  
  This was originally added so that only one of diskmbr.h or diskpc98.h
  was chosen and is no longer needed after PC98's removal.  However, the
  special handling was also broken as it effectively prevented the decoding
  of ioctls declared in other headers such as <sys/disk.h> or
  <sys/disklabel.h>.

Modified:
  head/lib/libsysdecode/mkioctls

Modified: head/lib/libsysdecode/mkioctls
==============================================================================
--- head/lib/libsysdecode/mkioctls	Tue Jul 18 20:46:29 2017	(r321175)
+++ head/lib/libsysdecode/mkioctls	Tue Jul 18 21:09:29 2017	(r321176)
@@ -18,13 +18,11 @@ LC_ALL=C; export LC_ALL
 ioctl_includes=$(
 	cd $includedir
 	find -H -s * -name '*.h' | \
-	egrep -v '(.*disk.*|net/pfvar|net/if_pfsync)\.h' | \
+	egrep -v '(net/pfvar|net/if_pfsync)\.h' | \
 		xargs egrep -l \
 '^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]' |
 		awk '{printf("#include <%s>\\n", $1)}'
 )
-
-ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n"
 
 awk -v x="$ioctl_includes" 'BEGIN {print x}' |
 	$CPP -nostdinc -I$includedir -dM -DCOMPAT_43TTY - |