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 6f9e78b342d6826bf0edb90e68ef20d52bd76cf5..05cfbc43905d0c51f0ff3922c125948aaafd022e 100644 (file)
--- 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 f72be14b9ef652e2572592fe70eb063357ca2cc2..904a09d2d22cfc19e1ef72bf074acc452fdee494 100644 (file)
--- 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 c9a39b36e4d37be1240598583b8356a10c93893e..0e76f43268fa3c56d97747dac0fde8a4d57d40b4 100644 (file)
--- 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 01eaccb392005c83feee1e7bdcab9a2ca0c0ede0..9c4729ef890d7f30a666d2b49c5f359a5affcfa4 100644 (file)
--- 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 8b686c0cd01b412b5d55b28f6622f805b2291ba1..dd1593d4927ca1a483a2146538fd734508f6a18e 100644 (file)
--- 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 1d866fa1a7f448757e23790ce6b7f4537cdeb427..8e3ef4e52d6436662de3685c4604b17aa9eeafb4 100644 (file)
--- 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;
 }