mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-16 13:16:47 +02:00
util/nvmutil: use braces on nested ifs
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
@@ -178,9 +178,10 @@ set_io_flags(int argc, char *argv[])
|
|||||||
const char *arg_cmd = argv[2];
|
const char *arg_cmd = argv[2];
|
||||||
|
|
||||||
flags = O_RDWR;
|
flags = O_RDWR;
|
||||||
if (argc > 2)
|
if (argc > 2) {
|
||||||
if (strcmp(arg_cmd, "dump") == 0)
|
if (strcmp(arg_cmd, "dump") == 0)
|
||||||
flags = O_RDONLY;
|
flags = O_RDONLY;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -243,9 +244,10 @@ read_gbe(void)
|
|||||||
if ((cmd == cmd_copy) || (cmd == cmd_swap))
|
if ((cmd == cmd_copy) || (cmd == cmd_swap))
|
||||||
invert = 1;
|
invert = 1;
|
||||||
|
|
||||||
for (p = 0; p < 2; p++)
|
for (p = 0; p < 2; p++) {
|
||||||
if (do_read[p])
|
if (do_read[p])
|
||||||
read_gbe_part(p, invert);
|
read_gbe_part(p, invert);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -325,11 +327,12 @@ set_mac_nib(int mac_pos, int nib, uint8_t *h)
|
|||||||
mac[mac_pos + nib]);
|
mac[mac_pos + nib]);
|
||||||
|
|
||||||
/* If random, ensure that local/unicast bits are set */
|
/* If random, ensure that local/unicast bits are set */
|
||||||
if ((byte == 0) && (nib == 1))
|
if ((byte == 0) && (nib == 1)) {
|
||||||
if ((mac[mac_pos + nib] == '?') ||
|
if ((mac[mac_pos + nib] == '?') ||
|
||||||
(mac[mac_pos + nib] == 'x') ||
|
(mac[mac_pos + nib] == 'x') ||
|
||||||
(mac[mac_pos + nib] == 'X')) /* random */
|
(mac[mac_pos + nib] == 'X')) /* random */
|
||||||
*h = (*h & 0xE) | 2; /* local, unicast */
|
*h = (*h & 0xE) | 2; /* local, unicast */
|
||||||
|
}
|
||||||
|
|
||||||
macbuf[byte >> 1] |= ((uint16_t ) *h) << ((8 * (byte % 2)) +
|
macbuf[byte >> 1] |= ((uint16_t ) *h) << ((8 * (byte % 2)) +
|
||||||
(4 * (nib ^ 1)));
|
(4 * (nib ^ 1)));
|
||||||
@@ -346,7 +349,8 @@ hextonum(char ch)
|
|||||||
return ch - 'a' + 10;
|
return ch - 'a' + 10;
|
||||||
else if ((ch == '?') || (ch == 'x') || (ch == 'X'))
|
else if ((ch == '?') || (ch == 'x') || (ch == 'X'))
|
||||||
return rhex(); /* random hex value */
|
return rhex(); /* random hex value */
|
||||||
return 16; /* error: invalid character */
|
else
|
||||||
|
return 16; /* error: invalid character */
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint8_t
|
static uint8_t
|
||||||
|
|||||||
Reference in New Issue
Block a user