diff options
| author | Peter Jones <pjones@redhat.com> | 2021-01-29 15:11:18 -0500 |
|---|---|---|
| committer | Peter Jones <pmjones@gmail.com> | 2021-01-29 18:24:57 -0500 |
| commit | 0789f48d70b7593808f18dc4f1dbce2ca67df0f4 (patch) | |
| tree | e8225c9aed99b2f73e573c80027b1a8b2e7509dc | |
| parent | 5e3d9cd9985d700a871e329cea90721532888adf (diff) | |
| download | efi-boot-shim-0789f48d70b7593808f18dc4f1dbce2ca67df0f4.tar.gz efi-boot-shim-0789f48d70b7593808f18dc4f1dbce2ca67df0f4.zip | |
Always use lower case for our local include file names.
clang-format doesn't allow you to specify an include sort order, and
just assumes asciibetical is a pretty good order, which doesn't work as
well as you would hope.
This makes them all lower case so they don't need to be re-sorted.
I also went through and checked that we're using quoted local includes
at all the appropriate places.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | include/efiauthenticated.h | 2 | ||||
| -rw-r--r-- | include/http.h (renamed from include/Http.h) | 0 | ||||
| -rw-r--r-- | include/ip4config2.h (renamed from include/Ip4Config2.h) | 0 | ||||
| -rw-r--r-- | include/ip6config.h (renamed from include/Ip6Config.h) | 0 | ||||
| -rw-r--r-- | include/passwordcrypt.h (renamed from include/PasswordCrypt.h) | 0 | ||||
| -rw-r--r-- | include/pe.h (renamed from include/PeImage.h) | 2 | ||||
| -rw-r--r-- | include/variables.h | 4 | ||||
| -rw-r--r-- | lib/security_policy.c | 5 | ||||
| -rw-r--r-- | shim.h | 10 |
9 files changed, 9 insertions, 14 deletions
diff --git a/include/efiauthenticated.h b/include/efiauthenticated.h index 7157ffd2..7c683e36 100644 --- a/include/efiauthenticated.h +++ b/include/efiauthenticated.h @@ -1,7 +1,7 @@ #ifndef SHIM_EFIAUTHENTICATED_H #define SHIM_EFIAUTHENTICATED_H -#include <wincert.h> +#include "wincert.h" /*********************************************************************** * Signature Database diff --git a/include/Http.h b/include/http.h index 4b3746a7..4b3746a7 100644 --- a/include/Http.h +++ b/include/http.h diff --git a/include/Ip4Config2.h b/include/ip4config2.h index efacaf83..efacaf83 100644 --- a/include/Ip4Config2.h +++ b/include/ip4config2.h diff --git a/include/Ip6Config.h b/include/ip6config.h index f99ce013..f99ce013 100644 --- a/include/Ip6Config.h +++ b/include/ip6config.h diff --git a/include/PasswordCrypt.h b/include/passwordcrypt.h index cadad727..cadad727 100644 --- a/include/PasswordCrypt.h +++ b/include/passwordcrypt.h diff --git a/include/PeImage.h b/include/pe.h index 209b96fb..49b89ae0 100644 --- a/include/PeImage.h +++ b/include/pe.h @@ -22,7 +22,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #ifndef SHIM_PEIMAGE_H
#define SHIM_PEIMAGE_H
-#include <wincert.h>
+#include "wincert.h"
#define SIGNATURE_16(A, B) ((A) | (B << 8))
#define SIGNATURE_32(A, B, C, D) (SIGNATURE_16 (A, B) | (SIGNATURE_16 (C, D) << 16))
diff --git a/include/variables.h b/include/variables.h index 436adb46..ee746ff6 100644 --- a/include/variables.h +++ b/include/variables.h @@ -1,8 +1,8 @@ #ifndef SHIM_VARIABLES_H #define SHIM_VARIABLES_H -#include <efiauthenticated.h> -#include <PeImage.h> /* for SHA256_DIGEST_SIZE */ +#include "efiauthenticated.h" +#include "pe.h" /* for SHA256_DIGEST_SIZE */ #define certlist_for_each_certentry(cl, cl_init, s, s_init) \ for (cl = (EFI_SIGNATURE_LIST *)(cl_init), s = (s_init); \ diff --git a/lib/security_policy.c b/lib/security_policy.c index 211f1cfd..b51bcf77 100644 --- a/lib/security_policy.c +++ b/lib/security_policy.c @@ -11,12 +11,7 @@ #include "shim.h" -#include <variables.h> -#include <simple_file.h> -#include <errors.h> - #if defined(OVERRIDE_SECURITY_POLICY) -#include <security_policy.h> /* * See the UEFI Platform Initialization manual (Vol2: DXE) for this @@ -128,13 +128,13 @@ #include "include/errors.h" #include "include/execute.h" #include "include/guid.h" -#include "include/Http.h" +#include "include/http.h" #include "include/httpboot.h" -#include "include/Ip4Config2.h" -#include "include/Ip6Config.h" +#include "include/ip4config2.h" +#include "include/ip6config.h" #include "include/netboot.h" -#include "include/PasswordCrypt.h" -#include "include/PeImage.h" +#include "include/passwordcrypt.h" +#include "include/pe.h" #include "include/replacements.h" #if defined(OVERRIDE_SECURITY_POLICY) #include "include/security_policy.h" |