[PATCH 6/8] mount, umount, swapon, fsck, lsblk, findmnt: harmonize six error messages

[Benno Schulenberg <bensberg@xxxxxxxxxxxxx>]

Signed-off-by: Benno Schulenberg <bensberg@xxxxxxxxxxxxx>
---
 disk-utils/fsck.c         |    2 +-
 misc-utils/findmnt.c      |    2 +-
 misc-utils/lsblk.c        |    3 +--
 sys-utils/mount.c         |    3 +--
 sys-utils/swapon-common.c |    3 +--
 sys-utils/umount.c        |    3 +--
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 6f9e78b..05cfbc4 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 f72be14..904a09d 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 c9a39b3..0e76f43 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 01eaccb..abc7a3e 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 8b686c0..dd1593d 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 1d866fa..8e3ef4e 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;
 }
 
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html