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>
This commit is contained in:
Peter Jones 2021-01-29 15:11:18 -05:00 committed by Peter Jones
parent 5e3d9cd998
commit 0789f48d70
9 changed files with 9 additions and 14 deletions

View File

@ -1,7 +1,7 @@
#ifndef SHIM_EFIAUTHENTICATED_H
#define SHIM_EFIAUTHENTICATED_H
#include <wincert.h>
#include "wincert.h"
/***********************************************************************
* Signature Database

View File

@ -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))

View File

@ -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); \

View File

@ -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

10
shim.h
View File

@ -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"