SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot: Rename cleanup functions

Browse Source
This commit is contained in:
Jan Janssen
2022-01-03 10:15:24 +01:00
parent 3c80c7bacf
commit 0b2281a209
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/boot/efi/boot.c
+4 -4
View File
@@ -1298,7 +1298,7 @@ static void config_entry_bump_counters(
EFI_FILE_HANDLE root_dir) {
_cleanup_freepool_ CHAR16* old_path = NULL, *new_path = NULL;
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE handle = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE handle = NULL;
_cleanup_freepool_ EFI_FILE_INFO *file_info = NULL;
UINTN file_info_size;
EFI_STATUS err;
@@ -1555,7 +1555,7 @@ static void config_load_entries(
EFI_FILE *root_dir,
const CHAR16 *loaded_image_path) {
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE entries_dir = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE entries_dir = NULL;
_cleanup_freepool_ EFI_FILE_INFO *f = NULL;
UINTN f_size = 0;
EFI_STATUS err;
@@ -1970,7 +1970,7 @@ static void config_entry_add_linux(
EFI_HANDLE *device,
EFI_FILE *root_dir) {
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE linux_dir = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE linux_dir = NULL;
_cleanup_freepool_ EFI_FILE_INFO *f = NULL;
ConfigEntry *entry;
UINTN f_size = 0;
@@ -2344,7 +2344,7 @@ static void config_load_all_entries(
EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
_cleanup_freepool_ EFI_LOADED_IMAGE *loaded_image = NULL;
_cleanup_(FileHandleClosep) EFI_FILE *root_dir = NULL;
_cleanup_(file_handle_closep) EFI_FILE *root_dir = NULL;
_cleanup_(config_free) Config config = {};
CHAR16 *loaded_image_path;
EFI_STATUS err;
src/boot/efi/console.c
+2 -2
View File
@@ -12,7 +12,7 @@
#define VERTICAL_MAX_OK 1080
#define VIEWPORT_RATIO 10
static inline void EventClosep(EFI_EVENT *event) {
static inline void event_closep(EFI_EVENT *event) {
if (!*event)
return;
@@ -42,7 +42,7 @@ EFI_STATUS console_key_read(UINT64 *key, UINT64 timeout_usec) {
static BOOLEAN checked = FALSE;
UINTN index;
EFI_STATUS err;
_cleanup_(EventClosep) EFI_EVENT timer = NULL;
_cleanup_(event_closep) EFI_EVENT timer = NULL;
assert(key);
src/boot/efi/cpio.c
+1 -1
View File
@@ -316,7 +316,7 @@ EFI_STATUS pack_cpio(
void **ret_buffer,
UINTN *ret_buffer_size) {
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE root = NULL, extra_dir = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE root = NULL, extra_dir = NULL;
UINTN dirent_size = 0, buffer_size = 0, n_items = 0, n_allocated = 0;
_cleanup_freepool_ CHAR16 *rel_dropin_dir = NULL;
_cleanup_freepool_ EFI_FILE_INFO *dirent = NULL;
src/boot/efi/devicetree.c
+1 -1
View File
@@ -66,7 +66,7 @@ static EFI_STATUS devicetree_fixup(struct devicetree_state *state, UINTN len) {
EFI_STATUS devicetree_install(struct devicetree_state *state,
EFI_FILE_HANDLE root_dir, CHAR16 *name) {
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE handle = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE handle = NULL;
_cleanup_freepool_ EFI_FILE_INFO *info = NULL;
UINTN len;
EFI_STATUS err;
src/boot/efi/drivers.c
+1 -1
View File
@@ -77,7 +77,7 @@ EFI_STATUS load_drivers(
EFI_LOADED_IMAGE *loaded_image,
EFI_FILE_HANDLE root_dir) {
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE drivers_dir = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE drivers_dir = NULL;
_cleanup_freepool_ EFI_FILE_INFO *dirent = NULL;
UINTN dirent_size = 0, n_succeeded = 0;
EFI_STATUS err;
src/boot/efi/pe.c
+1 -1
View File
@@ -224,7 +224,7 @@ EFI_STATUS pe_file_locate_sections(
UINTN *offsets,
UINTN *sizes) {
_cleanup_freepool_ struct PeSectionHeader *section_table = NULL;
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE handle = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE handle = NULL;
struct DosFileHeader dos;
struct PeFileHeader pe;
UINTN len, section_table_len;
src/boot/efi/random-seed.c
+1 -1
View File
@@ -225,7 +225,7 @@ static void validate_sha256(void) {
EFI_STATUS process_random_seed(EFI_FILE *root_dir, RandomSeedMode mode) {
_cleanup_freepool_ void *seed = NULL, *new_seed = NULL, *rng = NULL, *for_kernel = NULL, *system_token = NULL;
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE handle = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE handle = NULL;
UINTN size, rsize, wsize, system_token_size = 0;
_cleanup_freepool_ EFI_FILE_INFO *info = NULL;
EFI_STATUS err;
src/boot/efi/util.c
+2 -2
View File
@@ -436,7 +436,7 @@ CHAR8 *strchra(const CHAR8 *s, CHAR8 c) {
}
EFI_STATUS file_read(EFI_FILE_HANDLE dir, const CHAR16 *name, UINTN off, UINTN size, CHAR8 **ret, UINTN *ret_size) {
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE handle = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE handle = NULL;
_cleanup_freepool_ CHAR8 *buf = NULL;
EFI_STATUS err;
@@ -703,7 +703,7 @@ EFI_STATUS open_directory(
const CHAR16 *path,
EFI_FILE_HANDLE *ret) {
_cleanup_(FileHandleClosep) EFI_FILE_HANDLE dir = NULL;
_cleanup_(file_handle_closep) EFI_FILE_HANDLE dir = NULL;
_cleanup_freepool_ EFI_FILE_INFO *file_info = NULL;
EFI_STATUS err;
src/boot/efi/util.h
+3 -3
View File
@@ -73,7 +73,7 @@ CHAR16 *xstra_to_str(const CHAR8 *stra);
EFI_STATUS file_read(EFI_FILE_HANDLE dir, const CHAR16 *name, UINTN off, UINTN size, CHAR8 **content, UINTN *content_size);
static inline void FreePoolp(void *p) {
static inline void free_poolp(void *p) {
void *q = *(void**) p;
if (!q)
@@ -82,9 +82,9 @@ static inline void FreePoolp(void *p) {
FreePool(q);
}
#define _cleanup_freepool_ _cleanup_(FreePoolp)
#define _cleanup_freepool_ _cleanup_(free_poolp)
static inline void FileHandleClosep(EFI_FILE_HANDLE *handle) {
static inline void file_handle_closep(EFI_FILE_HANDLE *handle) {
if (!*handle)
return;