From ffd42a82201423d7b82cffd755baf3d5cd5c7efc Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Thu, 29 Aug 2019 13:58:52 +0800 Subject: vboot: fix up some more includes Should have no extra line breaks in between local includes, and should be sorted alphabetically. BUG=b:124141368 TEST=make clean && make runtests BRANCH=none Change-Id: I83c25d30d7376712857314965a7d93f57190aa3f Signed-off-by: Joel Kitching Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1776281 Tested-by: Joel Kitching Commit-Queue: Joel Kitching Reviewed-by: Julius Werner --- futility/cmd_create.c | 20 +++++++++----------- futility/cmd_load_fmap.c | 1 - futility/cmd_pcr.c | 2 +- futility/cmd_show.c | 4 ++-- futility/cmd_sign.c | 4 ++-- futility/cmd_vbutil_firmware.c | 4 ++-- futility/cmd_vbutil_kernel.c | 2 +- futility/cmd_vbutil_keyblock.c | 2 +- futility/file_type_bios.c | 4 ++-- futility/file_type_rwsig.c | 4 ++-- futility/file_type_usbpd1.c | 6 +++--- futility/futility_options.h | 5 +++-- futility/misc.c | 3 +-- futility/ryu_root_header.c | 2 +- futility/updater.c | 2 +- futility/vb1_helper.c | 2 +- futility/vb2_helper.c | 16 +++++++--------- 17 files changed, 39 insertions(+), 44 deletions(-) (limited to 'futility') diff --git a/futility/cmd_create.c b/futility/cmd_create.c index 3dc11476..a3cb8b58 100644 --- a/futility/cmd_create.c +++ b/futility/cmd_create.c @@ -3,28 +3,26 @@ * found in the LICENSE file. */ +#include + #include #include #include -#include - -#include "2sysincludes.h" #include "2common.h" #include "2id.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" +#include "futility.h" +#include "futility_options.h" +#include "host_key2.h" +#include "host_key.h" +#include "host_misc2.h" #include "openssl_compat.h" #include "util_misc.h" -#include "vb2_common.h" #include "vb21_common.h" - -#include "host_key.h" -#include "host_key2.h" -#include "host_misc2.h" - -#include "futility.h" -#include "futility_options.h" +#include "vb2_common.h" /* Command line options */ enum { diff --git a/futility/cmd_load_fmap.c b/futility/cmd_load_fmap.c index 20da8015..818fda85 100644 --- a/futility/cmd_load_fmap.c +++ b/futility/cmd_load_fmap.c @@ -20,7 +20,6 @@ #include "fmap.h" #include "futility.h" - static const char usage[] = "\n" "Usage: " MYNAME " %s [OPTIONS] FILE AREA:file [AREA:file ...]\n" "\n" diff --git a/futility/cmd_pcr.c b/futility/cmd_pcr.c index 3b9b0ae8..dc4c3ffc 100644 --- a/futility/cmd_pcr.c +++ b/futility/cmd_pcr.c @@ -9,9 +9,9 @@ #include #include -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "futility.h" static const char usage[] = "\n" diff --git a/futility/cmd_show.c b/futility/cmd_show.c index e3fea0fb..544a41c1 100644 --- a/futility/cmd_show.c +++ b/futility/cmd_show.c @@ -18,12 +18,12 @@ #include #include -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2sha.h" -#include "file_type.h" +#include "2sysincludes.h" #include "file_type_bios.h" +#include "file_type.h" #include "fmap.h" #include "futility.h" #include "futility_options.h" diff --git a/futility/cmd_sign.c b/futility/cmd_sign.c index f221141a..a3342379 100644 --- a/futility/cmd_sign.c +++ b/futility/cmd_sign.c @@ -18,8 +18,8 @@ #include #include "2common.h" -#include "file_type.h" #include "file_type_bios.h" +#include "file_type.h" #include "fmap.h" #include "futility.h" #include "futility_options.h" @@ -28,9 +28,9 @@ #include "kernel_blob.h" #include "util_misc.h" #include "vb1_helper.h" +#include "vb21_common.h" #include "vb2_common.h" #include "vb2_struct.h" -#include "vb21_common.h" #include "vboot_common.h" /* Options */ diff --git a/futility/cmd_vbutil_firmware.c b/futility/cmd_vbutil_firmware.c index edd0f8d5..b8e9bc63 100644 --- a/futility/cmd_vbutil_firmware.c +++ b/futility/cmd_vbutil_firmware.c @@ -12,18 +12,18 @@ #include #include -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2rsa.h" +#include "2sysincludes.h" #include "futility.h" #include "host_common.h" #include "host_key2.h" #include "kernel_blob.h" #include "util_misc.h" -#include "vboot_common.h" #include "vb1_helper.h" #include "vb2_common.h" +#include "vboot_common.h" /* Command line options */ enum { diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index 17dae146..c909cff4 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -19,8 +19,8 @@ #include #include -#include "2sysincludes.h" #include "2common.h" +#include "2sysincludes.h" #include "file_type.h" #include "futility.h" #include "host_common.h" diff --git a/futility/cmd_vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c index 43811610..d526d553 100644 --- a/futility/cmd_vbutil_keyblock.c +++ b/futility/cmd_vbutil_keyblock.c @@ -11,9 +11,9 @@ #include #include -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" +#include "2sysincludes.h" #include "futility.h" #include "host_common.h" #include "host_key2.h" diff --git a/futility/file_type_bios.c b/futility/file_type_bios.c index 6cbd5835..44a4ca20 100644 --- a/futility/file_type_bios.c +++ b/futility/file_type_bios.c @@ -9,9 +9,9 @@ #include #include -#include "fmap.h" -#include "file_type.h" #include "file_type_bios.h" +#include "file_type.h" +#include "fmap.h" #include "futility.h" #include "futility_options.h" #include "host_common.h" diff --git a/futility/file_type_rwsig.c b/futility/file_type_rwsig.c index 9173a9bd..2990ba7c 100644 --- a/futility/file_type_rwsig.c +++ b/futility/file_type_rwsig.c @@ -14,20 +14,20 @@ #include #include -#include "2sysincludes.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "file_type.h" #include "fmap.h" #include "futility.h" #include "futility_options.h" -#include "vb21_common.h" #include "host_common.h" #include "host_key2.h" #include "host_misc.h" #include "host_signature2.h" #include "util_misc.h" +#include "vb21_common.h" #define SIGNATURE_RSVD_SIZE 1024 #define EC_RW_FILENAME "EC_RW.bin" diff --git a/futility/file_type_usbpd1.c b/futility/file_type_usbpd1.c index 34f8b455..2bcc48d1 100644 --- a/futility/file_type_usbpd1.c +++ b/futility/file_type_usbpd1.c @@ -16,18 +16,18 @@ #include #include -#include "2sysincludes.h" #include "2common.h" -#include "2sha.h" #include "2rsa.h" +#include "2sha.h" +#include "2sysincludes.h" #include "file_type.h" #include "futility.h" #include "futility_options.h" -#include "vb21_common.h" #include "host_common.h" #include "host_key2.h" #include "host_signature2.h" #include "util_misc.h" +#include "vb21_common.h" /* Return 1 if okay, 0 if not */ static int parse_size_opts(uint32_t len, diff --git a/futility/futility_options.h b/futility/futility_options.h index 368cc4f2..dc31728d 100644 --- a/futility/futility_options.h +++ b/futility/futility_options.h @@ -10,9 +10,10 @@ #define VBOOT_REFERENCE_FUTILITY_OPTIONS_H_ #include -#include "vboot_common.h" -#include "file_type.h" + #include "2rsa.h" +#include "file_type.h" +#include "vboot_common.h" struct vb2_private_key; struct vb21_packed_key; diff --git a/futility/misc.c b/futility/misc.c index 46bf24bb..de7db515 100644 --- a/futility/misc.c +++ b/futility/misc.c @@ -20,10 +20,9 @@ #include #include -#include "2sysincludes.h" - #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "cgptlib_internal.h" #include "file_type.h" #include "futility.h" diff --git a/futility/ryu_root_header.c b/futility/ryu_root_header.c index fff807be..ef005311 100644 --- a/futility/ryu_root_header.c +++ b/futility/ryu_root_header.c @@ -15,9 +15,9 @@ #include #include -#include "2sysincludes.h" #include "2common.h" #include "2sha.h" +#include "2sysincludes.h" #include "futility.h" #define SEARCH_STRIDE 4 diff --git a/futility/updater.c b/futility/updater.c index 9d2d3921..07d2d668 100644 --- a/futility/updater.c +++ b/futility/updater.c @@ -13,8 +13,8 @@ #include #include -#include "2rsa.h" #include "2common.h" +#include "2rsa.h" #include "crossystem.h" #include "fmap.h" #include "futility.h" diff --git a/futility/vb1_helper.c b/futility/vb1_helper.c index d99c45fa..84dc7969 100644 --- a/futility/vb1_helper.c +++ b/futility/vb1_helper.c @@ -10,11 +10,11 @@ #include #include -#include "2sysincludes.h" #include "2api.h" #include "2common.h" #include "2rsa.h" #include "2sha.h" +#include "2sysincludes.h" #include "file_type.h" #include "futility.h" #include "host_common.h" diff --git a/futility/vb2_helper.c b/futility/vb2_helper.c index cdaff888..f5b7978e 100644 --- a/futility/vb2_helper.c +++ b/futility/vb2_helper.c @@ -5,22 +5,20 @@ #include -#include "2sysincludes.h" #include "2common.h" #include "2id.h" #include "2rsa.h" #include "2sha.h" -#include "openssl_compat.h" -#include "util_misc.h" -#include "vb21_common.h" - -#include "host_common.h" -#include "host_key2.h" -#include "host_misc2.h" - +#include "2sysincludes.h" #include "file_type.h" #include "futility.h" #include "futility_options.h" +#include "host_common.h" +#include "host_key2.h" +#include "host_misc2.h" +#include "openssl_compat.h" +#include "util_misc.h" +#include "vb21_common.h" int vb2_lookup_hash_alg(const char *str, enum vb2_hash_algorithm *alg) { -- cgit v1.2.1