tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osdep/generic/blocklist: Fix compilation

Browse Source 
After recent change in blocklist types we have a type mismatch. Fixing it
requires a wrapper or large changes. I feel like wrapper makes more sense.

Without this patch we end up with a compilation problem and without wrapping
callback data is not passed properly anymore.

Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Vladimir Serbinenko 2023-08-24 09:33:47 +02:00 committed by Daniel Kiper
parent 2f3faf02c4
commit cb1824a871
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
grub-core/osdep/generic/blocklist.c
View File

@ -30,6 +30,26 @@
#define MAX_TRIES 5 #define MAX_TRIES 5
struct wrapper_hook_data
{
void (*callback) (grub_disk_addr_t sector,
unsigned int offset,
unsigned int length,
void *data);
void *callback_data;
};
static grub_err_t
callback_wrapper (grub_disk_addr_t sector,
unsigned int offset, unsigned int length,
char *buf, void *data)
{
struct wrapper_hook_data *wrap = data;
wrap->callback (sector, offset, length, wrap->callback_data);
return GRUB_ERR_NONE;
}
void void
grub_install_get_blocklist (grub_device_t root_dev, grub_install_get_blocklist (grub_device_t root_dev,
const char *core_path, const char *core_img, const char *core_path, const char *core_img,
@ -43,6 +63,10 @@ grub_install_get_blocklist (grub_device_t root_dev,
int i; int i;
char *tmp_img; char *tmp_img;
char *core_path_dev; char *core_path_dev;
struct wrapper_hook_data wrap_hook_data = {
.callback = callback,
.callback_data = hook_data
};
core_path_dev = grub_make_system_path_relative_to_its_root (core_path); core_path_dev = grub_make_system_path_relative_to_its_root (core_path);
@ -120,8 +144,8 @@ grub_install_get_blocklist (grub_device_t root_dev,
if (! file) if (! file)
grub_util_error ("%s", grub_errmsg); grub_util_error ("%s", grub_errmsg);
file->read_hook = callback; file->read_hook = callback_wrapper;
file->read_hook_data = hook_data; file->read_hook_data = &wrap_hook_data;
if (grub_file_read (file, tmp_img, core_size) != (grub_ssize_t) core_size) if (grub_file_read (file, tmp_img, core_size) != (grub_ssize_t) core_size)
grub_util_error ("%s", _("failed to read the sectors of the core image")); grub_util_error ("%s", _("failed to read the sectors of the core image"));