From owner-svn-src-all@freebsd.org  Mon Oct  3 02:37:30 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 CD476AC66EB;
 Mon,  3 Oct 2016 02:37:30 +0000 (UTC)
 (envelope-from marcel@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 860AE2A1;
 Mon,  3 Oct 2016 02:37:30 +0000 (UTC)
 (envelope-from marcel@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u932bT6T081953;
 Mon, 3 Oct 2016 02:37:29 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u932bSZ6081938;
 Mon, 3 Oct 2016 02:37:28 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201610030237.u932bSZ6081938@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Mon, 3 Oct 2016 02:37:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r306621 - head/usr.bin/mkimg
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Oct 2016 02:37:30 -0000

Author: marcel
Date: Mon Oct  3 02:37:28 2016
New Revision: 306621
URL: https://svnweb.freebsd.org/changeset/base/306621

Log:
  Prefer <stdint.h> over <sys/types.h>. While here remove redundant
  inclusion of <sys/queue.h>.
  
  Move the inclusion of the disk partitioning headers out of order
  and inbetween standard headers and local header. They will change
  in a subsequent commit.

Modified:
  head/usr.bin/mkimg/apm.c
  head/usr.bin/mkimg/bsd.c
  head/usr.bin/mkimg/ebr.c
  head/usr.bin/mkimg/format.c
  head/usr.bin/mkimg/gpt.c
  head/usr.bin/mkimg/image.c
  head/usr.bin/mkimg/mbr.c
  head/usr.bin/mkimg/mkimg.c
  head/usr.bin/mkimg/pc98.c
  head/usr.bin/mkimg/qcow.c
  head/usr.bin/mkimg/raw.c
  head/usr.bin/mkimg/scheme.c
  head/usr.bin/mkimg/vhd.c
  head/usr.bin/mkimg/vmdk.c
  head/usr.bin/mkimg/vtoc8.c

Modified: head/usr.bin/mkimg/apm.c
==============================================================================
--- head/usr.bin/mkimg/apm.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/apm.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,13 +27,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#include <sys/apm.h>
 #include <sys/errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <sys/apm.h>
+
 #include "endian.h"
 #include "image.h"
 #include "mkimg.h"

Modified: head/usr.bin/mkimg/bsd.c
==============================================================================
--- head/usr.bin/mkimg/bsd.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/bsd.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,13 +27,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#include <sys/disklabel.h>
 #include <sys/errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <sys/disklabel.h>
+
 #include "endian.h"
 #include "image.h"
 #include "mkimg.h"

Modified: head/usr.bin/mkimg/ebr.c
==============================================================================
--- head/usr.bin/mkimg/ebr.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/ebr.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,13 +27,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#include <sys/diskmbr.h>
 #include <sys/errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <sys/diskmbr.h>
+
 #include "endian.h"
 #include "image.h"
 #include "mkimg.h"

Modified: head/usr.bin/mkimg/format.c
==============================================================================
--- head/usr.bin/mkimg/format.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/format.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <err.h>
 #include <errno.h>

Modified: head/usr.bin/mkimg/gpt.c
==============================================================================
--- head/usr.bin/mkimg/gpt.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/gpt.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,10 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#include <sys/diskmbr.h>
 #include <sys/errno.h>
-#include <sys/gpt.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -38,6 +35,9 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <uuid.h>
 
+#include <sys/diskmbr.h>
+#include <sys/gpt.h>
+
 #include "endian.h"
 #include "image.h"
 #include "mkimg.h"

Modified: head/usr.bin/mkimg/image.c
==============================================================================
--- head/usr.bin/mkimg/image.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/image.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -28,9 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/mman.h>
-#include <sys/queue.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <assert.h>
 #include <err.h>
 #include <errno.h>

Modified: head/usr.bin/mkimg/mbr.c
==============================================================================
--- head/usr.bin/mkimg/mbr.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/mbr.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,13 +27,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#include <sys/diskmbr.h>
 #include <sys/errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <sys/diskmbr.h>
+
 #include "endian.h"
 #include "image.h"
 #include "mkimg.h"

Modified: head/usr.bin/mkimg/mkimg.c
==============================================================================
--- head/usr.bin/mkimg/mkimg.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/mkimg.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,9 +27,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/queue.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/uuid.h>
 #include <errno.h>
 #include <err.h>
@@ -37,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <getopt.h>
 #include <libutil.h>
 #include <limits.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: head/usr.bin/mkimg/pc98.c
==============================================================================
--- head/usr.bin/mkimg/pc98.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/pc98.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,13 +27,14 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
-#include <sys/diskpc98.h>
 #include <sys/errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <sys/diskpc98.h>
+
 #include "endian.h"
 #include "image.h"
 #include "mkimg.h"

Modified: head/usr.bin/mkimg/qcow.c
==============================================================================
--- head/usr.bin/mkimg/qcow.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/qcow.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/errno.h>
 #include <assert.h>
 #include <stdint.h>

Modified: head/usr.bin/mkimg/raw.c
==============================================================================
--- head/usr.bin/mkimg/raw.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/raw.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,8 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

Modified: head/usr.bin/mkimg/scheme.c
==============================================================================
--- head/usr.bin/mkimg/scheme.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/scheme.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <assert.h>
 #include <err.h>

Modified: head/usr.bin/mkimg/vhd.c
==============================================================================
--- head/usr.bin/mkimg/vhd.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/vhd.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,8 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/errno.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

Modified: head/usr.bin/mkimg/vmdk.c
==============================================================================
--- head/usr.bin/mkimg/vmdk.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/vmdk.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,7 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/errno.h>
 #include <stdint.h>
 #include <stdio.h>

Modified: head/usr.bin/mkimg/vtoc8.c
==============================================================================
--- head/usr.bin/mkimg/vtoc8.c	Mon Oct  3 01:46:47 2016	(r306620)
+++ head/usr.bin/mkimg/vtoc8.c	Mon Oct  3 02:37:28 2016	(r306621)
@@ -27,14 +27,15 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
 #include <sys/errno.h>
-#include <sys/vtoc.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <sys/vtoc.h>
+
 #include "endian.h"
 #include "image.h"
 #include "mkimg.h"