mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-03-25 21:39:03 +02:00
Merge pull request 'seabios: Fix malloc_fn function pointer in romfile patch' (#313) from alpernebbi/lbmk:seabios-romfile-malloc-fptr into master
Reviewed-on: https://codeberg.org/libreboot/lbmk/pulls/313
This commit is contained in:
@@ -18,7 +18,7 @@ Signed-off-by: Riku Viitanen <riku.viitanen@protonmail.com>
|
||||
2 files changed, 22 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/romfile.c b/src/romfile.c
|
||||
index b598274e..8bf95713 100644
|
||||
index b598274edc09..8ccf5139ece8 100644
|
||||
--- a/src/romfile.c
|
||||
+++ b/src/romfile.c
|
||||
@@ -47,10 +47,12 @@ romfile_find(const char *name)
|
||||
@@ -33,7 +33,7 @@ index b598274e..8bf95713 100644
|
||||
void *
|
||||
-romfile_loadfile(const char *name, int *psize)
|
||||
+romfile_loadfile_g(const char *name, int *psize,
|
||||
+ void *(*malloc_fn)(), int add_len)
|
||||
+ void *(*malloc_fn)(u32), int add_len)
|
||||
{
|
||||
struct romfile_s *file = romfile_find(name);
|
||||
if (!file)
|
||||
@@ -69,7 +69,7 @@ index b598274e..8bf95713 100644
|
||||
}
|
||||
|
||||
diff --git a/src/romfile.h b/src/romfile.h
|
||||
index 3e0f8200..a320a5bc 100644
|
||||
index 3e0f820047dd..1b967d86551f 100644
|
||||
--- a/src/romfile.h
|
||||
+++ b/src/romfile.h
|
||||
@@ -13,6 +13,8 @@ struct romfile_s {
|
||||
@@ -77,7 +77,7 @@ index 3e0f8200..a320a5bc 100644
|
||||
struct romfile_s *romfile_findprefix(const char *prefix, struct romfile_s *prev);
|
||||
struct romfile_s *romfile_find(const char *name);
|
||||
+void *romfile_loadfile_g(const char *name, int *psize,
|
||||
+ void *(*malloc_fn)(), int add_len);
|
||||
+ void *(*malloc_fn)(u32), int add_len);
|
||||
void *romfile_loadfile(const char *name, int *psize);
|
||||
u64 romfile_loadint(const char *name, u64 defval);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user