coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 05:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: don't pass h as param in cmd_setmac

Browse Source 
it's only needed in one function (tmp variable).

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-04 01:09:56 +00:00
parent 0d4822e700
commit 84376fa308
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+7 -7
View File
@@ -25,7 +25,7 @@ static void cmd_setmac(void);
static void parse_mac_string(void);
static void set_mac_byte(int);
static void check_mac_separator(int);
static void set_mac_nib(int, int, uint8_t *);
static void set_mac_nib(int, int);
static uint8_t hextonum(char);
static uint8_t rhex(void);
static void read_urandom(uint8_t *, size_t);
@@ -344,11 +344,10 @@ static void
set_mac_byte(int mac_pos)
{
int nib;
uint8_t h = 0;
check_mac_separator(mac_pos);
for (nib = 0; nib < 2; nib++)
set_mac_nib(mac_pos, nib, &h);
set_mac_nib(mac_pos, nib);
}
static void
@@ -365,11 +364,12 @@ check_mac_separator(int mac_pos)
}
static void
set_mac_nib(int mac_pos, int nib, uint8_t *h)
set_mac_nib(int mac_pos, int nib)
{
uint8_t h;
int byte = mac_pos / 3;
if ((*h = hextonum(mac[mac_pos + nib])) > 15)
if ((h = hextonum(mac[mac_pos + nib])) > 15)
err(EINVAL, "Invalid character '%c'",
mac[mac_pos + nib]);
@@ -378,10 +378,10 @@ set_mac_nib(int mac_pos, int nib, uint8_t *h)
if ((mac[mac_pos + nib] == '?') ||
(mac[mac_pos + nib] == 'x') ||
(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)));
}