X Tutup
Skip to content

Commit 7be4b23

Browse files
poetteringpoettering
committed
efi-loader: split efi-api.[ch] from efi-loader.[ch]
Some refactoring: split efi-loader.[ch] in two: isolate the calls that implement out boot loader interface spec, and those which implement access to upstream UEFI firmware features. They are quite different in nature and behaviour, and even semantically it makes to keep these two separate. At the very least because the previous name "efi-loader.[ch]" suggests all was about loader-specific APIs, but much of it is generic uefi stuff... While we are at it, I renamed a bunch of return parameters to follow our usual ret_xyz naming. But besides renaming no real code changes.
1 parent 8fc5c44 commit 7be4b23

File tree

10 files changed

+653
-620
lines changed

10 files changed

+653
-620
lines changed

‎src/boot/bless-boot.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include "alloc-util.h"
77
#include "bootspec.h"
8+
#include "efi-api.h"
89
#include "efi-loader.h"
910
#include "efivars.h"
1011
#include "fd-util.h"

‎src/boot/bootctl.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include "bootspec.h"
1818
#include "copy.h"
1919
#include "dirent-util.h"
20+
#include "efi-api.h"
2021
#include "efi-loader.h"
2122
#include "efivars.h"
2223
#include "env-file.h"

‎src/cryptsetup/cryptsetup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "cryptsetup-tpm2.h"
1818
#include "cryptsetup-util.h"
1919
#include "device-util.h"
20-
#include "efi-loader.h"
20+
#include "efi-api.h"
2121
#include "env-util.h"
2222
#include "escape.h"
2323
#include "fileio.h"

‎src/login/logind-dbus.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "cgroup-util.h"
2121
#include "device-util.h"
2222
#include "dirent-util.h"
23+
#include "efi-api.h"
2324
#include "efi-loader.h"
2425
#include "efivars.h"
2526
#include "env-file.h"

‎src/shared/condition.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "cgroup-util.h"
2323
#include "condition.h"
2424
#include "cpu-set-util.h"
25-
#include "efi-loader.h"
25+
#include "efi-api.h"
2626
#include "env-file.h"
2727
#include "env-util.h"
2828
#include "extract-word.h"

0 commit comments

Comments
 (0)
X Tutup