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;
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;
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;
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;
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;
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 */
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)
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 */
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");
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;
}
}
-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;
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) {
return EFI_SUCCESS;
}
-EFI_STATUS readdir_harder(
+EFI_STATUS readdir(
EFI_FILE *handle,
EFI_FILE_INFO **buffer,
size_t *buffer_size) {
* 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;
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))
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);