From 0b2281a2097fab3ac2d965cf2791100287f7b219 Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Mon, 3 Jan 2022 10:15:24 +0100 Subject: boot: Rename cleanup functions --- src/boot/efi/boot.c | 8 ++++---- src/boot/efi/console.c | 4 ++-- src/boot/efi/cpio.c | 2 +- src/boot/efi/devicetree.c | 2 +- src/boot/efi/drivers.c | 2 +- src/boot/efi/pe.c | 2 +- src/boot/efi/random-seed.c | 2 +- src/boot/efi/util.c | 4 ++-- src/boot/efi/util.h | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c index 0360d2a0bf..e623c2c8b6 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -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; diff --git a/src/boot/efi/console.c b/src/boot/efi/console.c index 86cd15a235..b8142c38b3 100644 --- a/src/boot/efi/console.c +++ b/src/boot/efi/console.c @@ -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); diff --git a/src/boot/efi/cpio.c b/src/boot/efi/cpio.c index 74610cc1c7..924ac35939 100644 --- a/src/boot/efi/cpio.c +++ b/src/boot/efi/cpio.c @@ -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; diff --git a/src/boot/efi/devicetree.c b/src/boot/efi/devicetree.c index 30ba88c4f8..476843bbce 100644 --- a/src/boot/efi/devicetree.c +++ b/src/boot/efi/devicetree.c @@ -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; diff --git a/src/boot/efi/drivers.c b/src/boot/efi/drivers.c index ce5cf3dcd7..9a8ef93fef 100644 --- a/src/boot/efi/drivers.c +++ b/src/boot/efi/drivers.c @@ -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; diff --git a/src/boot/efi/pe.c b/src/boot/efi/pe.c index ed3b0b8e94..2fc38f7b36 100644 --- a/src/boot/efi/pe.c +++ b/src/boot/efi/pe.c @@ -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; diff --git a/src/boot/efi/random-seed.c b/src/boot/efi/random-seed.c index dbf309b726..9d8e34d1ee 100644 --- a/src/boot/efi/random-seed.c +++ b/src/boot/efi/random-seed.c @@ -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; diff --git a/src/boot/efi/util.c b/src/boot/efi/util.c index 76e4eef1eb..e11655660b 100644 --- a/src/boot/efi/util.c +++ b/src/boot/efi/util.c @@ -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; diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h index b40f05eaef..b4e8d4de33 100644 --- a/src/boot/efi/util.h +++ b/src/boot/efi/util.h @@ -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; -- cgit v1.2.3