coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-22 14:36:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

util/nvmutil: remove pointless diagnostics

Browse Source 
we only need to know the number of bytes written or
read under error conditions.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-02-23 09:47:36 +00:00
parent 45413f1209
commit 4473179300
1 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+1 -24
View File
@@ -211,8 +211,6 @@ readGbe(void)
gbe[0] = (size_t) buf; gbe[0] = (size_t) buf;
gbe[1] = gbe[0] + (nf * (do_read[0] & do_read[1])); gbe[1] = gbe[0] + (nf * (do_read[0] & do_read[1]));
ssize_t tnr = 0;
for (int p = 0; p < 2; p++) { for (int p = 0; p < 2; p++) {
if (!do_read[p]) if (!do_read[p])
continue; continue;
@@ -220,7 +218,6 @@ readGbe(void)
ssize_t nr = pread(fd, (uint8_t *) gbe[p], nf, p * partsize); ssize_t nr = pread(fd, (uint8_t *) gbe[p], nf, p * partsize);
err_if(nr == -1); err_if(nr == -1);
if (nr == nf) { if (nr == nf) {
tnr += nr;
swap(p); /* handle big-endian host CPU */ swap(p); /* handle big-endian host CPU */
continue; continue;
} }
@@ -229,8 +226,6 @@ readGbe(void)
"%ld bytes read from '%s' part %d, expected %ld bytes\n", "%ld bytes read from '%s' part %d, expected %ld bytes\n",
nr, filename, p, nf); nr, filename, p, nf);
} }
printf("%ld bytes read from file '%s'\n", tnr, filename);
} }
void void
@@ -424,8 +419,6 @@ goodChecksum(int partnum)
void void
writeGbe(void) writeGbe(void)
{ {
ssize_t tnw = 0;
for (int p = 0; p < 2; p++) { for (int p = 0; p < 2; p++) {
if ((!nvmPartChanged[p]) || (flags == O_RDONLY)) if ((!nvmPartChanged[p]) || (flags == O_RDONLY))
continue; continue;
@@ -433,30 +426,14 @@ writeGbe(void)
swap(p); /* swap bytes on big-endian host CPUs */ swap(p); /* swap bytes on big-endian host CPUs */
ssize_t nw = pwrite(fd, (uint8_t *) gbe[p], nf, p * partsize); ssize_t nw = pwrite(fd, (uint8_t *) gbe[p], nf, p * partsize);
err_if(nw == -1); err_if(nw == -1);
if (nw == nf) { if (nw == nf)
tnw += nf;
continue; continue;
}
err(errno == ECANCELED, err(errno == ECANCELED,
"%ld bytes written to '%s' part %d, expected %ld bytes\n", "%ld bytes written to '%s' part %d, expected %ld bytes\n",
nw, filename, p, nf); nw, filename, p, nf);
} }
if ((flags != O_RDONLY) && (cmd != cmd_dump)) {
if (nvmPartChanged[0] || nvmPartChanged[1])
printf("The following nvm words were written:\n");
cmd_dump();
}
if ((!tnw) && (flags != O_RDONLY) && (!errno))
fprintf(stderr, "No changes needed on file '%s'\n", filename);
else if (tnw)
printf("%ld bytes written to file '%s'\n", tnw, filename);
if (tnw)
errno = 0;
err_if(close(fd) == -1); err_if(close(fd) == -1);
} }