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: rename err_eagain() to try_err()

Browse Source 
makes more sense in code

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-03-14 00:59:28 +00:00
parent b345caa25c
commit 100cb2014e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+8 -8
View File
@@ -339,7 +339,7 @@ static ssize_t prw(int fd, void *mem, size_t nrw,
static int rw_over_nrw(ssize_t r, size_t nrw); static int rw_over_nrw(ssize_t r, size_t nrw);
static off_t lseek_eintr(int fd, off_t off, static off_t lseek_eintr(int fd, off_t off,
int whence, int loop_eagain, int loop_eintr); int whence, int loop_eagain, int loop_eintr);
static int err_eagain(int loop_err, int errval); static int try_err(int loop_err, int errval);
/* /*
* Error handling and cleanup * Error handling and cleanup
@@ -1722,8 +1722,8 @@ try_rw_again:
else if (rw_type == IO_READ) else if (rw_type == IO_READ)
r = read(fd, mem, nrw); r = read(fd, mem, nrw);
if (r == -1 && (errno == err_eagain(loop_eintr, EINTR) if (r == -1 && (errno == try_err(loop_eintr, EINTR)
|| errno == err_eagain(loop_eagain, EAGAIN))) || errno == try_err(loop_eagain, EAGAIN)))
goto try_rw_again; goto try_rw_again;
return rw_over_nrw(r, nrw); return rw_over_nrw(r, nrw);
@@ -1757,8 +1757,8 @@ try_rw_again:
r = rw_over_nrw(r, nrw); r = rw_over_nrw(r, nrw);
} while (r == -1 && } while (r == -1 &&
(errno == err_eagain(loop_eintr, EINTR) (errno == try_err(loop_eintr, EINTR)
|| errno == err_eagain(loop_eagain, EAGAIN))); || errno == try_err(loop_eagain, EAGAIN)));
saved_errno = errno; saved_errno = errno;
if (lseek_eintr(fd, off_orig, SEEK_SET, if (lseek_eintr(fd, off_orig, SEEK_SET,
@@ -1828,14 +1828,14 @@ lseek_eintr(int fd, off_t off, int whence,
old = lseek(fd, off, whence); old = lseek(fd, off, whence);
} while (old == (off_t)-1 } while (old == (off_t)-1
&& (!( && (!(
errno == err_eagain(loop_eintr, EINTR) || errno == try_err(loop_eintr, EINTR) ||
errno == err_eagain(loop_eagain, EAGAIN)))); errno == try_err(loop_eagain, EAGAIN))));
return old; return old;
} }
static int static int
err_eagain(int loop_err, int errval) try_err(int loop_err, int errval)
{ {
if (loop_err) if (loop_err)
return errval; return errval;