svn commit: r306621 - head/usr.bin/mkimg
Marcel Moolenaar
marcel at FreeBSD.org
Mon Oct 3 02:37:30 UTC 2016
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"
More information about the svn-src-head
mailing list