canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/nvmutil: rename tbw/bw to tnw/nw 

to match nr in the readGbe function

number of bytes written, and total number
of bytes written.

Signed-off-by: Leah Rowe <leah@libreboot.org>
master
Leah Rowe 2025-01-27 04:59:17 +00:00
parent 3c6198a780
commit 97beb4305b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/nvmutil/nvmutil.c
View File

@ -427,27 +427,27 @@ writeGbe(void)
if ((!gbeFileChanged) || (flags == O_RDONLY)) if ((!gbeFileChanged) || (flags == O_RDONLY))
return; return;
ssize_t tbw = 0; /* total bytes written */ ssize_t tnw = 0; /* total bytes written */
for (int p = 0; p < 2; p++) { for (int p = 0; p < 2; p++) {
if ((!nvmPartChanged[p])) if ((!nvmPartChanged[p]))
continue; continue;
swap(p); /* swap bytes on big-endian host CPUs */ swap(p); /* swap bytes on big-endian host CPUs */
ssize_t bw = pwrite(fd, (uint8_t *) gbe[p], nf, p * partsize); ssize_t nw = pwrite(fd, (uint8_t *) gbe[p], nf, p * partsize);
err_if(bw == -1); err_if(nw == -1);
if (bw != nf) if (nw != nf)
err(errno == ECANCELED, err(errno == ECANCELED,
"%ld bytes written on '%s', expected %ld bytes\n", "%ld bytes written on '%s', expected %ld bytes\n",
bw, filename, nf); nw, filename, nf);
tbw += nf; tnw += nf;
} }
if ((!tbw) && (gbeFileChanged)) if ((!tnw) && (gbeFileChanged))
fprintf(stderr, "No changes needed on file '%s'\n", filename); fprintf(stderr, "No changes needed on file '%s'\n", filename);
else if (tbw) else if (tnw)
printf("%ld bytes written to file '%s'\n", tbw, filename); printf("%ld bytes written to file '%s'\n", tnw, filename);
errno = 0; errno = 0;
err_if(close(fd) == -1); err_if(close(fd) == -1);