mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-21 19:26:22 +02:00
util/nvmutil: explicitly cast on read/pread/pwrite
these functions return ssize_t, so compare explicitly to that, when using the SIZE_4KB define for example. Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
@@ -242,7 +242,7 @@ static void
|
|||||||
read_gbe_part(int p, int invert)
|
read_gbe_part(int p, int invert)
|
||||||
{
|
{
|
||||||
if (pread(fd, buf + (SIZE_4KB * (p ^ invert)), SIZE_4KB, p * partsize)
|
if (pread(fd, buf + (SIZE_4KB * (p ^ invert)), SIZE_4KB, p * partsize)
|
||||||
!= SIZE_4KB)
|
!= (ssize_t) SIZE_4KB)
|
||||||
err(ECANCELED,
|
err(ECANCELED,
|
||||||
"Can't read %d b from '%s' p%d", SIZE_4KB, fname, p);
|
"Can't read %d b from '%s' p%d", SIZE_4KB, fname, p);
|
||||||
swap(p ^ invert); /* handle big-endian host CPU */
|
swap(p ^ invert); /* handle big-endian host CPU */
|
||||||
@@ -350,7 +350,7 @@ rhex(void)
|
|||||||
if (!n) {
|
if (!n) {
|
||||||
n = sizeof(rnum) - 1;
|
n = sizeof(rnum) - 1;
|
||||||
if (read(rfd, (uint8_t *) &rnum, sizeof(rnum))
|
if (read(rfd, (uint8_t *) &rnum, sizeof(rnum))
|
||||||
!= sizeof(rnum))
|
!= (ssize_t) (sizeof(rnum)))
|
||||||
err(ECANCELED, "Could not read from /dev/urandom");
|
err(ECANCELED, "Could not read from /dev/urandom");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -534,7 +534,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, p * partsize) != SIZE_4KB) {
|
SIZE_4KB, p * partsize) != (ssize_t) 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);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user