From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 16 Mar 2016 08:55:53 +0000 (+0100)
Subject: mount, umount, swapon, fsck, lsblk, findmnt: harmonize six error messages
X-Git-Tag: v2.28-rc2~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b779c1aecb90a1bd097ec3c287eb3febd0959005;p=thirdparty%2Futil-linux.git

mount, umount, swapon, fsck, lsblk, findmnt: harmonize six error messages

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 6f9e78b342..05cfbc4390 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -470,7 +470,7 @@ static void fs_interpret_type(struct libmnt_fs *fs)
 static int parser_errcb(struct libmnt_table *tb __attribute__ ((__unused__)),
 			const char *filename, int line)
 {
-	warnx(_("%s: parse error at line %d -- ignore"), filename, line);
+	warnx(_("%s: parse error at line %d -- ignored"), filename, line);
 	return 1;
 }
 
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index f72be14b9e..904a09d2d2 100644
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -804,7 +804,7 @@ leave:
 static int parser_errcb(struct libmnt_table *tb __attribute__ ((__unused__)),
 			const char *filename, int line)
 {
-	warnx(_("%s: parse error at line %d"), filename, line);
+	warnx(_("%s: parse error at line %d -- ignored"), filename, line);
 	return 1;
 }
 
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index c9a39b36e4..0e76f43268 100644
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -430,8 +430,7 @@ static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)
 			const char *filename, int line)
 {
 	if (filename)
-		warnx(_("%s: parse error: ignore entry at line %d."),
-							filename, line);
+		warnx(_("%s: parse error at line %d -- ignored"), filename, line);
 	return 1;
 }
 
diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 01eaccb392..9c4729ef89 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -99,8 +99,7 @@ static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)
 			const char *filename, int line)
 {
 	if (filename)
-		warnx(_("%s: parse error: ignore entry at line %d."),
-							filename, line);
+		warnx(_("%s: parse error at line %d -- ignored"), filename, line);
 	return 1;
 }
 
diff --git a/sys-utils/swapon-common.c b/sys-utils/swapon-common.c
index 8b686c0cd0..dd1593d492 100644
--- a/sys-utils/swapon-common.c
+++ b/sys-utils/swapon-common.c
@@ -16,8 +16,7 @@ static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)
 			const char *filename, int line)
 {
 	if (filename)
-		warnx(_("%s: parse error: ignore entry at line %d."),
-							filename, line);
+		warnx(_("%s: parse error at line %d -- ignored"), filename, line);
 	return 1;
 }
 
diff --git a/sys-utils/umount.c b/sys-utils/umount.c
index 1d866fa1a7..8e3ef4e52d 100644
--- a/sys-utils/umount.c
+++ b/sys-utils/umount.c
@@ -43,8 +43,7 @@ static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)
 			const char *filename, int line)
 {
 	if (filename)
-		warnx(_("%s: parse error: ignore entry at line %d."),
-							filename, line);
+		warnx(_("%s: parse error at line %d -- ignored"), filename, line);
 	return 1;
 }