coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-21 10:12:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

nvmutil: split malloc handling out of readGbe

Browse Source 
this has to do with memory allocation, not actual reading
of the gbe file into memory. split it up, for clarity.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-02-23 11:10:12 +00:00
parent 3d408317b1
commit 061e6048a8
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+10 -5
View File
@@ -15,10 +15,10 @@
#include <unistd.h> #include <unistd.h>
void cmd_setchecksum(void), cmd_brick(void), swap(int partnum), writeGbe(void), void cmd_setchecksum(void), cmd_brick(void), swap(int partnum), writeGbe(void),
cmd_dump(void), cmd_setmac(void), readGbe(void), checkdir(const char *path), cmd_dump(void), cmd_setmac(void), nvmalloc(void), readGbe(void),
macf(int partnum), hexdump(int partnum), openFiles(const char *path), checkdir(const char *path), macf(int partnum), hexdump(int partnum),
cmd_copy(void), parseMacString(const char *strMac, uint16_t *mac), parseMacString(const char *strMac, uint16_t *mac), cmd_swap(void),
cmd_swap(void); openFiles(const char *path), cmd_copy(void);
int goodChecksum(int partnum); int goodChecksum(int partnum);
uint8_t hextonum(char chs), rhex(void); uint8_t hextonum(char chs), rhex(void);
@@ -154,6 +154,7 @@ main(int argc, char *argv[])
} }
err_if((errno = (cmd == NULL) ? EINVAL : errno)); err_if((errno = (cmd == NULL) ? EINVAL : errno));
nvmalloc();
readGbe(); readGbe();
(*cmd)(); (*cmd)();
writeGbe(); writeGbe();
@@ -194,7 +195,7 @@ openFiles(const char *path)
} }
void void
readGbe(void) nvmalloc(void)
{ {
if ((cmd == cmd_swap) || (cmd == cmd_copy)) if ((cmd == cmd_swap) || (cmd == cmd_copy))
nf = SIZE_4KB; nf = SIZE_4KB;
@@ -210,7 +211,11 @@ readGbe(void)
gbe[0] = (size_t) buf; gbe[0] = (size_t) buf;
gbe[1] = gbe[0] + (nf * (do_read[0] & do_read[1])); gbe[1] = gbe[0] + (nf * (do_read[0] & do_read[1]));
}
void
readGbe(void)
{
for (int p = 0; p < 2; p++) { for (int p = 0; p < 2; p++) {
if (!do_read[p]) if (!do_read[p])
continue; continue;