coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-18 13:49:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: remove redundant casts

Browse Source 
these just bloat the code

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-03 23:55:46 +00:00
parent 3b8de31f37
commit be28140741
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+14 -21
View File
@@ -169,8 +169,7 @@ set_cmd(int argc, char *argv[])
cmd = ops[i].cmd; cmd = ops[i].cmd;
break; break;
} }
err(EINVAL, "Too few args on command '%s'", err(EINVAL, "Too few args on command '%s'", ops[i].str);
ops[i].str);
} }
} }
@@ -263,14 +262,12 @@ read_gbe_part(int p, int invert)
int retry; int retry;
ssize_t rval; ssize_t rval;
for (retry = 0; retry < (int) MAX_RETRY_READ; retry++) { for (retry = 0; retry < MAX_RETRY_READ; retry++) {
rval = pread(fd, buf + (SIZE_4KB * (p ^ invert)), rval = pread(fd, buf + (SIZE_4KB * (p ^ invert)),
SIZE_4KB, ((off_t ) p) * partsize); SIZE_4KB, ((off_t ) p) * partsize);
if (valid_read(fname, rval, if (valid_read(fname, rval, SIZE_4KB, retry, "pread"))
(ssize_t) SIZE_4KB, retry, "pread")) {
break; break;
}
} }
swap(p ^ invert); /* handle big-endian host CPU */ swap(p ^ invert); /* handle big-endian host CPU */
@@ -301,7 +298,7 @@ parse_mac_string(void)
if (strnlen(mac, 20) != 17) if (strnlen(mac, 20) != 17)
err(EINVAL, "Invalid MAC address string length"); err(EINVAL, "Invalid MAC address string length");
(void) memset(macbuf, 0, sizeof(macbuf)); memset(macbuf, 0, sizeof(macbuf));
for (mac_pos = 0; mac_pos < 16; mac_pos += 3) for (mac_pos = 0; mac_pos < 16; mac_pos += 3)
set_mac_byte(mac_pos); set_mac_byte(mac_pos);
@@ -384,7 +381,7 @@ rhex(void)
if (!n) { if (!n) {
n = sizeof(rnum) - 1; n = sizeof(rnum) - 1;
read_urandom((uint8_t *) rnum, sizeof(rnum)); read_urandom(rnum, sizeof(rnum));
} }
return rnum[n--] & 0xf; return rnum[n--] & 0xf;
@@ -396,8 +393,8 @@ read_urandom(uint8_t *rnum, size_t rsize)
int retry = 0; int retry = 0;
ssize_t rval; ssize_t rval;
for (retry = 0; retry < (int) MAX_RETRY_READ; retry++) { for (retry = 0; retry < MAX_RETRY_READ; retry++) {
rval = read(rfd, (uint8_t *) rnum, rsize); rval = read(rfd, rnum, rsize);
if (valid_read("/dev/urandom", rval, rsize, retry, "read")) if (valid_read("/dev/urandom", rval, rsize, retry, "read"))
break; break;
} }
@@ -546,6 +543,7 @@ good_checksum(int partnum)
fprintf(stderr, "WARNING: BAD checksum in part %d\n", fprintf(stderr, "WARNING: BAD checksum in part %d\n",
partnum ^ invert); partnum ^ invert);
set_err(ECANCELED); set_err(ECANCELED);
return 0; return 0;
} }
@@ -554,12 +552,10 @@ static uint16_t
word(int pos16, int p) word(int pos16, int p)
{ {
uint16_t rval = 0; uint16_t rval = 0;
check_bound(pos16, p); check_bound(pos16, p);
(void) memcpy( memcpy(&rval, buf + (SIZE_4KB * p) + (pos16 << 1), sizeof(uint16_t));
(uint8_t *) &rval,
(uint8_t *) (buf + (SIZE_4KB * p) + (pos16 << 1)),
sizeof(uint16_t)
);
return rval; return rval;
} }
@@ -567,12 +563,9 @@ static void
set_word(int pos16, int p, uint16_t val16) set_word(int pos16, int p, uint16_t val16)
{ {
check_bound(pos16, p); check_bound(pos16, p);
memcpy(buf + (SIZE_4KB * p) + (pos16 << 1), &val16, sizeof(uint16_t));
part_modified[p] = 1; part_modified[p] = 1;
(void) memcpy(
(uint8_t *) (buf + (SIZE_4KB * p) + (pos16 << 1)),
(uint8_t *) &val16,
sizeof(uint16_t)
);
} }
static void static void
@@ -604,7 +597,7 @@ write_gbe_part(int p)
swap(p); /* swap bytes on big-endian host CPUs */ swap(p); /* swap bytes on big-endian host CPUs */
if (pwrite(fd, buf + (SIZE_4KB * p), if (pwrite(fd, buf + (SIZE_4KB * p),
SIZE_4KB, ((off_t) p) * partsize) != (ssize_t) SIZE_4KB) { SIZE_4KB, ((off_t) p) * partsize) != SIZE_4KB) {
err(ECANCELED, err(ECANCELED,
"Can't write %d b to '%s' p%d", SIZE_4KB, fname, p); "Can't write %d b to '%s' p%d", SIZE_4KB, fname, p);
} }