aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2016-10-06 23:59:34 +0200
committerJohn Crispin <john@phrozen.org>2016-10-15 11:36:50 +0200
commitc66658441b78736e5537c10ed2b380b8aa568d24 (patch)
tree40127fc3ce8292faf04fd0a6f54b13ae16bbb3b7 /package
parent098f7156cc68d07a8eed9574c76b90c7ade77026 (diff)
downloadupstream-c66658441b78736e5537c10ed2b380b8aa568d24.tar.gz
upstream-c66658441b78736e5537c10ed2b380b8aa568d24.tar.bz2
upstream-c66658441b78736e5537c10ed2b380b8aa568d24.zip
mtd: fix up error messages
remove the "Error fixing up TRX header" message which is misleading. Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'package')
-rw-r--r--package/system/mtd/src/mtd.c2
-rw-r--r--package/system/mtd/src/trx.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/system/mtd/src/mtd.c b/package/system/mtd/src/mtd.c
index 8fbddf56da..0d5ad22ef6 100644
--- a/package/system/mtd/src/mtd.c
+++ b/package/system/mtd/src/mtd.c
@@ -586,7 +586,7 @@ resume:
if (!quiet)
fprintf(stderr, "\b\b\b ");
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 */
skip = mtd_replace_jffs2(mtd, fd, e, jffs2file);
jffs2_replaced = 1;
diff --git a/package/system/mtd/src/trx.c b/package/system/mtd/src/trx.c
index 360a1271e3..1f5c52914c 100644
--- a/package/system/mtd/src/trx.c
+++ b/package/system/mtd/src/trx.c
@@ -81,6 +81,7 @@ trx_fixup(int fd, const char *name)
ptr = mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_SHARED, bfd, 0);
if (!ptr || (ptr == (void *) -1)) {
perror("mmap");
+ fprintf(stderr, "Mapping the TRX header failed\n");
goto err1;
}
@@ -100,7 +101,6 @@ trx_fixup(int fd, const char *name)
err1:
close(bfd);
err:
- fprintf(stderr, "Error fixing up TRX header\n");
return -1;
}