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

util/nvmutil: rename set_err for code clarity

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-10 16:14:43 +00:00
parent c41483916a
commit f0240df229
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+13 -13
View File
@@ -221,7 +221,7 @@ static off_t lseek_eintr(int fd, off_t off, int whence);
static void err(int nvm_errval, const char *msg, ...); static void err(int nvm_errval, const char *msg, ...);
static void close_files(void); static void close_files(void);
static const char *getnvmprogname(void); static const char *getnvmprogname(void);
static void set_err(int errval); static void set_err_if_unset(int errval);
static void usage(uint8_t usage_exit); static void usage(uint8_t usage_exit);
/* /*
@@ -704,7 +704,7 @@ xstrxcmp(const char *a, const char *b, size_t maxlen)
/* /*
* Should never reach here. This keeps compilers happy. * Should never reach here. This keeps compilers happy.
*/ */
set_err(EINVAL); set_err_if_unset(EINVAL);
return -1; return -1;
} }
@@ -848,7 +848,7 @@ good_checksum(size_t partnum)
if (current_checksum == expected_checksum) if (current_checksum == expected_checksum)
return 1; return 1;
set_err(EINVAL); set_err_if_unset(EINVAL);
return 0; return 0;
} }
@@ -1406,15 +1406,15 @@ rw_file_exact(int fd, uint8_t *mem, size_t len,
size_t rc = 0; size_t rc = 0;
if (fd < 0) { if (fd < 0) {
set_err(EIO); set_err_if_unset(EIO);
return -1; return -1;
} }
if (!len) { if (!len) {
set_err(EIO); set_err_if_unset(EIO);
return -1; return -1;
} }
if (len > (size_t)SSIZE_MAX) { if (len > (size_t)SSIZE_MAX) {
set_err(EIO); set_err_if_unset(EIO);
return -1; return -1;
} }
@@ -1430,14 +1430,14 @@ rw_file_exact(int fd, uint8_t *mem, size_t len,
} else if (rw_type == LESEN) { } else if (rw_type == LESEN) {
rval = read(fd, mem + rc, len - rc); rval = read(fd, mem + rc, len - rc);
} else { } else {
set_err(EIO); set_err_if_unset(EIO);
return -1; return -1;
} }
if (rval >= 0) { if (rval >= 0) {
if ((size_t)rval > (len - rc) /* Prevent overflow */ if ((size_t)rval > (len - rc) /* Prevent overflow */
|| rval == 0) { /* Prevent infinite 0-byte loop */ || rval == 0) { /* Prevent infinite 0-byte loop */
set_err(EIO); set_err_if_unset(EIO);
return -1; return -1;
} }
@@ -1445,7 +1445,7 @@ rw_file_exact(int fd, uint8_t *mem, size_t len,
continue; continue;
} }
set_err(EIO); set_err_if_unset(EIO);
return -1; return -1;
} }
@@ -1480,7 +1480,7 @@ prw(int fd, void *mem, size_t nrw,
else if (rw_type == PSCHREIB) else if (rw_type == PSCHREIB)
r = write(fd, mem, nrw); r = write(fd, mem, nrw);
else { else {
set_err(EINVAL); set_err_if_unset(EINVAL);
return -1; return -1;
} }
} while (r < 0 && errno == EINTR); } while (r < 0 && errno == EINTR);
@@ -1522,7 +1522,7 @@ err(int nvm_errval, const char *msg, ...)
* one that does this. * one that does this.
* *
* Since the errval is for setting errno, -1 * Since the errval is for setting errno, -1
* would be incorrect. Therefore, set_err() * would be incorrect. Therefore, set_err_if_unset()
* avoids overriding errno if the given value * avoids overriding errno if the given value
* is negative. * is negative.
* *
@@ -1537,7 +1537,7 @@ err(int nvm_errval, const char *msg, ...)
vfprintf(stderr, msg, args); vfprintf(stderr, msg, args);
va_end(args); va_end(args);
set_err(nvm_errval); set_err_if_unset(nvm_errval);
fprintf(stderr, ": %s", strerror(errno)); fprintf(stderr, ": %s", strerror(errno));
fprintf(stderr, "\n"); fprintf(stderr, "\n");
@@ -1577,7 +1577,7 @@ getnvmprogname(void)
} }
static void static void
set_err(int x) set_err_if_unset(int x)
{ {
if (errno) if (errno)
return; return;