From: Jan Kiszka <[email protected]> Make it easier to spot where headers are coming from: External ones are included via angle brackets, internal ones are put in quotes - even if not technically needed - and separated into an own include block.
Signed-off-by: Jan Kiszka <[email protected]> --- drivers/utils/simatic.c | 1 + drivers/utils/smbios.c | 2 +- drivers/watchdog/amdfch_wdt.c | 3 ++- drivers/watchdog/atom-quark.c | 1 + drivers/watchdog/eiois200_wdt.c | 3 ++- drivers/watchdog/hpwdt.c | 1 + drivers/watchdog/i6300esb.c | 1 + drivers/watchdog/ipc4x7e_wdt.c | 3 ++- drivers/watchdog/ipcbx21a.c | 1 + drivers/watchdog/ipmi_wdt.c | 1 + drivers/watchdog/itco.c | 3 ++- drivers/watchdog/w83627hf_wdt.c | 3 ++- drivers/watchdog/wdat.c | 1 + drivers/watchdog/wdfuncs_end.c | 1 + drivers/watchdog/wdfuncs_start.c | 1 + env/env_config_file.c | 1 + env/env_disk_utils.c | 3 ++- env/fatvars.c | 9 +++++---- env/uservars.c | 1 + include/configuration.h | 3 ++- include/env_api.h | 3 ++- include/env_config_file.h | 2 ++ include/env_config_partitions.h | 1 + include/env_disk_utils.h | 1 + include/syspart.h | 1 + loader_interface.c | 1 + main.c | 9 +++++---- 27 files changed, 44 insertions(+), 17 deletions(-) diff --git a/drivers/utils/simatic.c b/drivers/utils/simatic.c index 777fc1a..46db70f 100644 --- a/drivers/utils/simatic.c +++ b/drivers/utils/simatic.c @@ -16,6 +16,7 @@ #include <efi.h> #include <efilib.h> + #include "simatic.h" #include "smbios.h" #include "utils.h" diff --git a/drivers/utils/smbios.c b/drivers/utils/smbios.c index 8b75132..18a052f 100644 --- a/drivers/utils/smbios.c +++ b/drivers/utils/smbios.c @@ -13,7 +13,7 @@ * SPDX-License-Identifier: GPL-2.0-only */ -#include <smbios.h> +#include "smbios.h" SMBIOS_STRUCTURE_POINTER smbios_find_struct(SMBIOS_STRUCTURE_TABLE *table, UINT16 type) diff --git a/drivers/watchdog/amdfch_wdt.c b/drivers/watchdog/amdfch_wdt.c index d7082f1..15b5bdd 100644 --- a/drivers/watchdog/amdfch_wdt.c +++ b/drivers/watchdog/amdfch_wdt.c @@ -16,7 +16,8 @@ #include <efilib.h> #include <pci/header.h> #include <sys/io.h> -#include <mmio.h> + +#include "mmio.h" #include "print.h" #include "utils.h" diff --git a/drivers/watchdog/atom-quark.c b/drivers/watchdog/atom-quark.c index ef891fa..a4c88e1 100644 --- a/drivers/watchdog/atom-quark.c +++ b/drivers/watchdog/atom-quark.c @@ -16,6 +16,7 @@ #include <efilib.h> #include <pci/header.h> #include <sys/io.h> + #include "print.h" #include "utils.h" diff --git a/drivers/watchdog/eiois200_wdt.c b/drivers/watchdog/eiois200_wdt.c index 6fd61e9..b7be223 100644 --- a/drivers/watchdog/eiois200_wdt.c +++ b/drivers/watchdog/eiois200_wdt.c @@ -17,7 +17,8 @@ #include <efilib.h> #include <pci/header.h> #include <sys/io.h> -#include <mmio.h> + +#include "mmio.h" #include "print.h" #include "smbios.h" #include "utils.h" diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index becea61..64af90b 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -14,6 +14,7 @@ #include <efi.h> #include <pci/header.h> + #include "print.h" #include "utils.h" diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c index 626709b..b60dbbe 100644 --- a/drivers/watchdog/i6300esb.c +++ b/drivers/watchdog/i6300esb.c @@ -15,6 +15,7 @@ #include <efi.h> #include <efilib.h> #include <pci/header.h> + #include "print.h" #include "utils.h" diff --git a/drivers/watchdog/ipc4x7e_wdt.c b/drivers/watchdog/ipc4x7e_wdt.c index b0bb54f..899756e 100644 --- a/drivers/watchdog/ipc4x7e_wdt.c +++ b/drivers/watchdog/ipc4x7e_wdt.c @@ -17,7 +17,8 @@ #include <efilib.h> #include <pci/header.h> #include <sys/io.h> -#include <mmio.h> + +#include "mmio.h" #include "print.h" #include "simatic.h" #include "utils.h" diff --git a/drivers/watchdog/ipcbx21a.c b/drivers/watchdog/ipcbx21a.c index c9f50ea..92d83f3 100644 --- a/drivers/watchdog/ipcbx21a.c +++ b/drivers/watchdog/ipcbx21a.c @@ -16,6 +16,7 @@ #include <efilib.h> #include <pci/header.h> #include <sys/io.h> + #include "print.h" #include "simatic.h" #include "utils.h" diff --git a/drivers/watchdog/ipmi_wdt.c b/drivers/watchdog/ipmi_wdt.c index faaab01..b088c61 100644 --- a/drivers/watchdog/ipmi_wdt.c +++ b/drivers/watchdog/ipmi_wdt.c @@ -15,6 +15,7 @@ #include <efi.h> #include <pci/header.h> #include <sys/io.h> + #include "print.h" #include "smbios.h" #include "utils.h" diff --git a/drivers/watchdog/itco.c b/drivers/watchdog/itco.c index d967c5b..c6ef030 100644 --- a/drivers/watchdog/itco.c +++ b/drivers/watchdog/itco.c @@ -17,7 +17,8 @@ #include <efilib.h> #include <pci/header.h> #include <sys/io.h> -#include <mmio.h> + +#include "mmio.h" #include "print.h" #include "utils.h" diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c index 94f985b..5e037a4 100644 --- a/drivers/watchdog/w83627hf_wdt.c +++ b/drivers/watchdog/w83627hf_wdt.c @@ -40,7 +40,8 @@ #include <efilib.h> #include <pci/header.h> #include <sys/io.h> -#include <mmio.h> + +#include "mmio.h" #include "print.h" #include "simatic.h" #include "utils.h" diff --git a/drivers/watchdog/wdat.c b/drivers/watchdog/wdat.c index 975d5b8..0dfc581 100644 --- a/drivers/watchdog/wdat.c +++ b/drivers/watchdog/wdat.c @@ -19,6 +19,7 @@ #include <efilib.h> #include <mmio.h> #include <sys/io.h> + #include "print.h" #include "utils.h" diff --git a/drivers/watchdog/wdfuncs_end.c b/drivers/watchdog/wdfuncs_end.c index f90ffc7..97bd6a1 100644 --- a/drivers/watchdog/wdfuncs_end.c +++ b/drivers/watchdog/wdfuncs_end.c @@ -15,6 +15,7 @@ #if GNU_EFI_VERSION < 3000016 #include <efi.h> + #include "utils.h" /* Section .init_array's end address for watchdog probing function pointers diff --git a/drivers/watchdog/wdfuncs_start.c b/drivers/watchdog/wdfuncs_start.c index c627050..b564fff 100644 --- a/drivers/watchdog/wdfuncs_start.c +++ b/drivers/watchdog/wdfuncs_start.c @@ -15,6 +15,7 @@ #if GNU_EFI_VERSION < 3000016 #include <efi.h> + #include "utils.h" /* Section .init_array's sentinel value and start address for watchdog probing diff --git a/env/env_config_file.c b/env/env_config_file.c index 03c618a..a81be35 100644 --- a/env/env_config_file.c +++ b/env/env_config_file.c @@ -14,6 +14,7 @@ #include <stdlib.h> #include <stdio.h> + #include "env_api.h" #include "env_disk_utils.h" #include "env_config_file.h" diff --git a/env/env_disk_utils.c b/env/env_disk_utils.c index bcf9f80..25e7ce9 100644 --- a/env/env_disk_utils.c +++ b/env/env_disk_utils.c @@ -12,9 +12,10 @@ * SPDX-License-Identifier: GPL-2.0-only */ -#include <stdlib.h> #include <mntent.h> +#include <stdlib.h> #include <string.h> + #include "env_api.h" #include "env_disk_utils.h" diff --git a/env/fatvars.c b/env/fatvars.c index 242d38b..76934f5 100644 --- a/env/fatvars.c +++ b/env/fatvars.c @@ -15,11 +15,12 @@ #include <efi.h> #include <efilib.h> #include <efiapi.h> -#include <bootguard.h> + +#include "bootguard.h" +#include "envdata.h" #include "print.h" -#include <utils.h> -#include <syspart.h> -#include <envdata.h> +#include "syspart.h" +#include "utils.h" static int current_partition = 0; static BG_ENVDATA *env; diff --git a/env/uservars.c b/env/uservars.c index 145ed5d..2fafa7d 100644 --- a/env/uservars.c +++ b/env/uservars.c @@ -13,6 +13,7 @@ */ #include <string.h> + #include "env_api.h" #include "uservars.h" diff --git a/include/configuration.h b/include/configuration.h index b172943..92ed0ef 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -18,7 +18,8 @@ #include <efilib.h> #include <efiprot.h> #include <efipciio.h> -#include <bootguard.h> + +#include "bootguard.h" BG_STATUS load_config(BG_LOADER_PARAMS *bg_loader_params); BG_STATUS save_config(BG_LOADER_PARAMS *bg_loader_params); diff --git a/include/env_api.h b/include/env_api.h index 24b2414..5778d84 100644 --- a/include/env_api.h +++ b/include/env_api.h @@ -25,12 +25,13 @@ #include <argp.h> #include <mntent.h> #include <fcntl.h> +#include <uchar.h> #include <sys/file.h> #include <sys/mount.h> + #include "config.h" #include "envdata.h" #include "ebgenv.h" -#include <uchar.h> #ifdef DEBUG #define printf_debug(fmt, ...) printf(fmt, __VA_ARGS__) diff --git a/include/env_config_file.h b/include/env_config_file.h index a95b395..91ed089 100644 --- a/include/env_config_file.h +++ b/include/env_config_file.h @@ -13,7 +13,9 @@ */ #pragma once + #include <stdio.h> + #include "env_api.h" FILE *open_config_file_from_part(const CONFIG_PART *cfgpart, const char *mode); diff --git a/include/env_config_partitions.h b/include/env_config_partitions.h index 4b6d2d9..bef5f15 100644 --- a/include/env_config_partitions.h +++ b/include/env_config_partitions.h @@ -15,6 +15,7 @@ #pragma once #include <stdbool.h> + #include "env_api.h" bool probe_config_partitions(CONFIG_PART *cfgpart, bool search_all_devices); diff --git a/include/env_disk_utils.h b/include/env_disk_utils.h index cec93c1..f1c1ce2 100644 --- a/include/env_disk_utils.h +++ b/include/env_disk_utils.h @@ -15,6 +15,7 @@ #pragma once #include <stdbool.h> + #include "env_api.h" char *get_mountpoint(const char *devpath); diff --git a/include/syspart.h b/include/syspart.h index e7686e9..21d5750 100644 --- a/include/syspart.h +++ b/include/syspart.h @@ -18,6 +18,7 @@ #include <efilib.h> #include <efiprot.h> #include <efipciio.h> + #include "bootguard.h" #define open_cfg_file(root, file, mode) \ diff --git a/loader_interface.c b/loader_interface.c index e4d5d05..8d9e6ea 100644 --- a/loader_interface.c +++ b/loader_interface.c @@ -14,6 +14,7 @@ #include <efi.h> #include <efilib.h> + #include "loader_interface.h" #include "utils.h" diff --git a/main.c b/main.c index 5d28d08..5e9142c 100644 --- a/main.c +++ b/main.c @@ -18,12 +18,13 @@ #include <efiprot.h> #include <efipciio.h> #include <pci/header.h> -#include <bootguard.h> -#include <configuration.h> -#include "version.h" + +#include "bootguard.h" +#include "configuration.h" +#include "loader_interface.h" #include "print.h" #include "utils.h" -#include "loader_interface.h" +#include "version.h" extern const unsigned long wdfuncs_start[]; extern const unsigned long wdfuncs_end[]; -- 2.47.3 -- You received this message because you are subscribed to the Google Groups "EFI Boot Guard" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion visit https://groups.google.com/d/msgid/efibootguard-dev/6fa7f3f39a28531dd71a5d31b8bc8e236a4edc06.1775543350.git.jan.kiszka%40siemens.com.
