shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-08 08:58:27 +03:00
Code

boot: Drop _harder suffix

Browse Source 
Since there is no use of gnu-efi functions anymore, we don't need to
distinguish them by name.
This commit is contained in:
Jan Janssen 2023-01-07 11:06:33 +01:00
parent 3ceaa05d56
commit 5fa3e628cd
7 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/boot/efi/boot.c
View File

@ -1373,7 +1373,7 @@ static void config_entry_bump_counters(ConfigEntry *entry, EFI_FILE *root_dir) {
if (err != EFI_SUCCESS)
return;
err = get_file_info_harder(handle, &file_info, &file_info_size);
err = get_file_info(handle, &file_info, &file_info_size);
if (err != EFI_SUCCESS)
return;
@ -1646,7 +1646,7 @@ static void config_load_entries(
for (;;) {
_cleanup_free_ char *content = NULL;
err = readdir_harder(entries_dir, &f, &f_size);
err = readdir(entries_dir, &f, &f_size);
if (err != EFI_SUCCESS || !f)
break;
@ -2115,7 +2115,7 @@ static void config_entry_add_unified(
size_t offs[_SECTION_MAX] = {}, szs[_SECTION_MAX] = {}, pos = 0;
char *line, *key, *value;
err = readdir_harder(linux_dir, &f, &f_size);
err = readdir(linux_dir, &f, &f_size);
if (err != EFI_SUCCESS || !f)
break;
@ -2298,7 +2298,7 @@ static EFI_STATUS initrd_prepare(
return err;
_cleanup_free_ EFI_FILE_INFO *info = NULL;
err = get_file_info_harder(handle, &info, NULL);
err = get_file_info(handle, &info, NULL);
if (err != EFI_SUCCESS)
return err;
@ -2491,7 +2491,7 @@ static EFI_STATUS secure_boot_discover_keys(Config *config, EFI_FILE *root_dir)
size_t dirent_size = 0;
ConfigEntry *entry = NULL;
err = readdir_harder(keys_basedir, &dirent, &dirent_size);
err = readdir(keys_basedir, &dirent, &dirent_size);
if (err != EFI_SUCCESS || !dirent)
return err;

2
src/boot/efi/cpio.c
View File

@ -373,7 +373,7 @@ EFI_STATUS pack_cpio(
for (;;) {
_cleanup_free_ char16_t *d = NULL;
err = readdir_harder(extra_dir, &dirent, &dirent_size);
err = readdir(extra_dir, &dirent, &dirent_size);
if (err != EFI_SUCCESS)
return log_error_status(err, "Failed to read extra directory of loaded image: %m");
if (!dirent) /* End of directory */

2
src/boot/efi/devicetree.c
View File

@ -79,7 +79,7 @@ EFI_STATUS devicetree_install(struct devicetree_state *state, EFI_FILE *root_dir
if (err != EFI_SUCCESS)
return err;
err = get_file_info_harder(handle, &info, NULL);
err = get_file_info(handle, &info, NULL);
if (err != EFI_SUCCESS)
return err;
if (info->FileSize < FDT_V1_SIZE || info->FileSize > 32 * 1024 * 1024)

2
src/boot/efi/drivers.c
View File

@ -87,7 +87,7 @@ EFI_STATUS load_drivers(
return log_error_status(err, "Failed to open \\EFI\\systemd\\drivers: %m");
for (;;) {
err = readdir_harder(drivers_dir, &dirent, &dirent_size);
err = readdir(drivers_dir, &dirent, &dirent_size);
if (err != EFI_SUCCESS)
return log_error_status(err, "Failed to read extra directory of loaded image: %m");
if (!dirent) /* End of directory */

2
src/boot/efi/random-seed.c
View File

@ -200,7 +200,7 @@ EFI_STATUS process_random_seed(EFI_FILE *root_dir) {
return err;
}
err = get_file_info_harder(handle, &info, NULL);
err = get_file_info(handle, &info, NULL);
if (err != EFI_SUCCESS)
return log_error_status(err, "Failed to get file info for random seed: %m");

16
src/boot/efi/util.c
View File

@ -298,7 +298,7 @@ EFI_STATUS file_read(EFI_FILE *dir, const char16_t *name, size_t off, size_t siz
if (size == 0) {
_cleanup_free_ EFI_FILE_INFO *info = NULL;
err = get_file_info_harder(handle, &info, NULL);
err = get_file_info(handle, &info, NULL);
if (err != EFI_SUCCESS)
return err;
@ -370,11 +370,7 @@ void sort_pointer_array(
}
}
EFI_STATUS get_file_info_harder(
EFI_FILE *handle,
EFI_FILE_INFO **ret,
size_t *ret_size) {
EFI_STATUS get_file_info(EFI_FILE *handle, EFI_FILE_INFO **ret, size_t *ret_size) {
size_t size = offsetof(EFI_FILE_INFO, FileName) + 256;
_cleanup_free_ EFI_FILE_INFO *fi = NULL;
EFI_STATUS err;
@ -382,8 +378,6 @@ EFI_STATUS get_file_info_harder(
assert(handle);
assert(ret);
/* A lot like LibFileInfo() but with useful error propagation */
fi = xmalloc(size);
err = handle->GetInfo(handle, MAKE_GUID_PTR(EFI_FILE_INFO), &size, fi);
if (err == EFI_BUFFER_TOO_SMALL) {
@ -403,7 +397,7 @@ EFI_STATUS get_file_info_harder(
return EFI_SUCCESS;
}
EFI_STATUS readdir_harder(
EFI_STATUS readdir(
EFI_FILE *handle,
EFI_FILE_INFO **buffer,
size_t *buffer_size) {
@ -423,7 +417,7 @@ EFI_STATUS readdir_harder(
* position when returning EFI_BUFFER_TOO_SMALL, effectively skipping over any files when
* the buffer was too small. Therefore, start with a buffer that should handle FAT32 max
* file name length.
* As a side effect, most readdir_harder() calls will now be slightly faster. */
* As a side effect, most readdir() calls will now be slightly faster. */
sz = sizeof(EFI_FILE_INFO) + 256 * sizeof(char16_t);
*buffer = xmalloc(sz);
*buffer_size = sz;
@ -489,7 +483,7 @@ EFI_STATUS open_directory(
if (err != EFI_SUCCESS)
return err;
err = get_file_info_harder(dir, &file_info, NULL);
err = get_file_info(dir, &file_info, NULL);
if (err != EFI_SUCCESS)
return err;
if (!FLAGS_SET(file_info->Attribute, EFI_FILE_DIRECTORY))

5
src/boot/efi/util.h
View File

@ -125,9 +125,8 @@ void clear_screen(size_t attr);
typedef int (*compare_pointer_func_t)(const void *a, const void *b);
void sort_pointer_array(void **array, size_t n_members, compare_pointer_func_t compare);
EFI_STATUS get_file_info_harder(EFI_FILE *handle, EFI_FILE_INFO **ret, size_t *ret_size);
EFI_STATUS readdir_harder(EFI_FILE *handle, EFI_FILE_INFO **buffer, size_t *buffer_size);
EFI_STATUS get_file_info(EFI_FILE *handle, EFI_FILE_INFO **ret, size_t *ret_size);
EFI_STATUS readdir(EFI_FILE *handle, EFI_FILE_INFO **buffer, size_t *buffer_size);
bool is_ascii(const char16_t *f);