hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mtd: fix up error messages 

remove the "Error fixing up TRX header" message which is misleading.

Signed-off-by: John Crispin <john@phrozen.org>
owl
John Crispin 2016-10-06 23:59:34 +02:00
parent 098f7156cc
commit c66658441b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/system/mtd/src/mtd.c
View File

@ -586,7 +586,7 @@ resume:
if (!quiet) if (!quiet)
fprintf(stderr, "\b\b\b "); fprintf(stderr, "\b\b\b ");
if (quiet < 2) if (quiet < 2)
fprintf(stderr, "\nAppending jffs2 data from %s to %s...", jffs2file, mtd); fprintf(stderr, "\nAppending jffs2 data from %s to %s..\n.", jffs2file, mtd);
/* got an EOF marker - this is the place to add some jffs2 data */ /* got an EOF marker - this is the place to add some jffs2 data */
skip = mtd_replace_jffs2(mtd, fd, e, jffs2file); skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
jffs2_replaced = 1; jffs2_replaced = 1;

2
package/system/mtd/src/trx.c
View File

@ -81,6 +81,7 @@ trx_fixup(int fd, const char *name)
ptr = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, bfd, 0); ptr = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, bfd, 0);
if (!ptr || (ptr == (void *) -1)) { if (!ptr || (ptr == (void *) -1)) {
perror("mmap"); perror("mmap");
fprintf(stderr, "Mapping the TRX header failed\n");
goto err1; goto err1;
} }
@ -100,7 +101,6 @@ trx_fixup(int fd, const char *name)
err1: err1:
close(bfd); close(bfd);
err: err:
fprintf(stderr, "Error fixing up TRX header\n");
return -1; return -1;
} }