coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-15 08:20:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: use spaces when calling err_if

Browse Source 
this is separate from other function calls. err_if
is used as though it was an if, where we always add
a space. it's just a quirk of my coding style.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-03 14:14:06 +00:00
parent 23cdfdd00a
commit b8091c7bdc
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+17 -17
View File
@@ -65,8 +65,8 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
#ifdef __OpenBSD__ #ifdef __OpenBSD__
err_if(pledge("stdio rpath wpath unveil", NULL) == -1); err_if (pledge("stdio rpath wpath unveil", NULL) == -1);
err_if(unveil("/dev/urandom", "r") == -1); err_if (unveil("/dev/urandom", "r") == -1);
#endif #endif
set_cmd(argc, argv); set_cmd(argc, argv);
@@ -74,24 +74,24 @@ main(int argc, char *argv[])
set_io_flags(argc, argv); set_io_flags(argc, argv);
#ifdef __OpenBSD__ #ifdef __OpenBSD__
if (flags == O_RDONLY) { if (flags == O_RDONLY) {
err_if(unveil(fname, "r") == -1); err_if (unveil(fname, "r") == -1);
err_if(unveil(NULL, NULL) == -1); err_if (unveil(NULL, NULL) == -1);
err_if(pledge("stdio rpath", NULL) == -1); err_if (pledge("stdio rpath", NULL) == -1);
} else { } else {
err_if(unveil(fname, "rw") == -1); err_if (unveil(fname, "rw") == -1);
err_if(unveil(NULL, NULL) == -1); err_if (unveil(NULL, NULL) == -1);
err_if(pledge("stdio rpath wpath", NULL) == -1); err_if (pledge("stdio rpath wpath", NULL) == -1);
} }
#endif #endif
openFiles(); openFiles();
#ifdef __OpenBSD__ #ifdef __OpenBSD__
err_if(pledge("stdio", NULL) == -1); err_if (pledge("stdio", NULL) == -1);
#endif #endif
read_gbe(); read_gbe();
(*cmd)(); (*cmd)();
write_gbe(); write_gbe();
err_if((errno != 0) && (cmd != cmd_dump)); err_if ((errno != 0) && (cmd != cmd_dump));
return errno ? EXIT_FAILURE : EXIT_SUCCESS; return errno ? EXIT_FAILURE : EXIT_SUCCESS;
} }
@@ -123,10 +123,10 @@ set_cmd(int argc, char *argv[])
if (argc > 3) if (argc > 3)
mac = MAC_ADDRESS; mac = MAC_ADDRESS;
} else if ((cmd != NULL) && (argc > 3)) { /* user-supplied partnum */ } else if ((cmd != NULL) && (argc > 3)) { /* user-supplied partnum */
err_if((errno = (!((part = PARTN[0] - '0') == 0 || part == 1)) err_if ((errno = (!((part = PARTN[0] - '0') == 0 || part == 1))
|| PARTN[1] ? EINVAL : errno)); /* only allow '0' or '1' */ || PARTN[1] ? EINVAL : errno)); /* only allow '0' or '1' */
} }
err_if((errno = (cmd == NULL) ? EINVAL : errno)); err_if ((errno = (cmd == NULL) ? EINVAL : errno));
} }
void void
@@ -301,7 +301,7 @@ rhex(void)
{ {
static uint8_t n = 0, rnum[16]; static uint8_t n = 0, rnum[16];
if (!n) if (!n)
err_if(read(rfd, (uint8_t *) &rnum, (n = 15) + 1) == -1); err_if (read(rfd, (uint8_t *) &rnum, (n = 15) + 1) == -1);
return rnum[n--] & 0xf; return rnum[n--] & 0xf;
} }
@@ -389,13 +389,13 @@ cmd_brick(void)
void void
cmd_copy(void) cmd_copy(void)
{ {
err_if(!good_checksum(part ^ 1)); err_if (!good_checksum(part ^ 1));
part_modified[part ^ 1] = 1; part_modified[part ^ 1] = 1;
} }
void void
cmd_swap(void) { cmd_swap(void) {
err_if(!(good_checksum(0) || good_checksum(1))); err_if (!(good_checksum(0) || good_checksum(1)));
errno = 0; errno = 0;
part_modified[1] = part_modified[0] = 1; part_modified[1] = part_modified[0] = 1;
@@ -447,7 +447,7 @@ write_gbe(void)
for (int p = 0; p < 2; p++) for (int p = 0; p < 2; p++)
if (part_modified[p]) if (part_modified[p])
write_gbe_part(p); write_gbe_part(p);
err_if(close(fd) == -1); err_if (close(fd) == -1);
} }
void void
@@ -477,7 +477,7 @@ void
usage(char *util) usage(char *util)
{ {
#ifdef __OpenBSD__ #ifdef __OpenBSD__
err_if(pledge("stdio", NULL) == -1); err_if (pledge("stdio", NULL) == -1);
#endif #endif
fprintf(stderr, fprintf(stderr,
"Modify Intel GbE NVM images e.g. set MAC\n" "Modify Intel GbE NVM images e.g. set MAC\n"