diff options
| author | Peter Jones <pjones@redhat.com> | 2017-10-19 15:44:12 -0400 |
|---|---|---|
| committer | Peter Jones <pmjones@gmail.com> | 2018-03-12 16:21:43 -0400 |
| commit | dc62a3c4dc3dd590fbba32c46b717088a132eb5e (patch) | |
| tree | 71993be00c4695abd13d139346346bfb4c791d8d /lib | |
| parent | 1a44dbb8be12ef2a06d73b8eec07ac0acff27e68 (diff) | |
| download | efi-boot-shim-dc62a3c4dc3dd590fbba32c46b717088a132eb5e.tar.gz efi-boot-shim-dc62a3c4dc3dd590fbba32c46b717088a132eb5e.zip | |
Move includes around to clean the source tree up a bit.
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/configtable.c | 3 | ||||
| -rw-r--r-- | lib/console.c | 9 | ||||
| -rw-r--r-- | lib/execute.c | 3 | ||||
| -rw-r--r-- | lib/security_policy.c | 2 | ||||
| -rw-r--r-- | lib/shell.c | 2 | ||||
| -rw-r--r-- | lib/simple_file.c | 7 | ||||
| -rw-r--r-- | lib/variables.c | 7 |
7 files changed, 7 insertions, 26 deletions
diff --git a/lib/configtable.c b/lib/configtable.c index edf2ed74..194637ee 100644 --- a/lib/configtable.c +++ b/lib/configtable.c @@ -8,8 +8,7 @@ #include <efi.h> #include <efilib.h> -#include <guid.h> -#include <configtable.h> +#include "shim.h" void * configtable_get_table(EFI_GUID *guid) diff --git a/lib/console.c b/lib/console.c index 0f50851b..b647dd1f 100644 --- a/lib/console.c +++ b/lib/console.c @@ -15,14 +15,7 @@ #include <openssl/err.h> #include <openssl/crypto.h> -static EFI_GUID SHIM_LOCK_GUID = { 0x605dab50, 0xe046, 0x4300, {0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23} }; - -static int min(int a, int b) -{ - if (a < b) - return a; - return b; -} +#include "shim.h" static int count_lines(CHAR16 *str_arr[]) diff --git a/lib/execute.c b/lib/execute.c index 89328c68..4abccc73 100644 --- a/lib/execute.c +++ b/lib/execute.c @@ -41,8 +41,7 @@ #include <efi.h> #include <efilib.h> -#include <guid.h> -#include <execute.h> +#include "shim.h" EFI_STATUS generate_path(CHAR16* name, EFI_LOADED_IMAGE *li, EFI_DEVICE_PATH **path, CHAR16 **PathName) diff --git a/lib/security_policy.c b/lib/security_policy.c index 53a2580a..889653d1 100644 --- a/lib/security_policy.c +++ b/lib/security_policy.c @@ -9,7 +9,7 @@ #include <efi.h> #include <efilib.h> -#include <guid.h> +#include "shim.h" #include <variables.h> #include <simple_file.h> #include <errors.h> diff --git a/lib/shell.c b/lib/shell.c index afd3952c..849f2660 100644 --- a/lib/shell.c +++ b/lib/shell.c @@ -8,7 +8,7 @@ #include <efi.h> #include <efilib.h> -#include <shell.h> +#include "shim.h" EFI_STATUS argsplit(EFI_HANDLE image, int *argc, CHAR16*** ARGV) diff --git a/lib/simple_file.c b/lib/simple_file.c index d345d870..f7762cc2 100644 --- a/lib/simple_file.c +++ b/lib/simple_file.c @@ -7,13 +7,8 @@ #include <efi.h> #include <efilib.h> -#include <console.h> -#include <simple_file.h> -#include <efiauthenticated.h> -#include <execute.h> /* for generate_path() */ +#include "shim.h" -static EFI_GUID IMAGE_PROTOCOL = LOADED_IMAGE_PROTOCOL; -static EFI_GUID SIMPLE_FS_PROTOCOL = SIMPLE_FILE_SYSTEM_PROTOCOL; static EFI_GUID FILE_INFO = EFI_FILE_INFO_ID; static EFI_GUID FS_INFO = EFI_FILE_SYSTEM_INFO_ID; diff --git a/lib/variables.c b/lib/variables.c index 59d7d054..8a993277 100644 --- a/lib/variables.c +++ b/lib/variables.c @@ -22,12 +22,7 @@ #include <efi.h> #include <efilib.h> -#include <efiauthenticated.h> - -#include <variables.h> -#include <guid.h> -#include <console.h> -#include <errors.h> +#include "shim.h" EFI_STATUS variable_create_esl(void *cert, int cert_len, EFI_GUID *type, EFI_GUID *owner, |