From: John Crispin <john@phrozen.org>
Date: Thu, 6 Oct 2016 21:59:34 +0000 (+0200)
Subject: mtd: fix up error messages
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c66658441b78736e5537c10ed2b380b8aa568d24;p=openwrt%2Fstaging%2Fadrian.git

mtd: fix up error messages

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

Signed-off-by: John Crispin <john@phrozen.org>
---

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;
 }