ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
This commit is contained in:
Benno Schulenberg 2016-03-16 09:55:53 +01:00 committed by Karel Zak
parent 426cdc0ac0
commit b779c1aecb
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disk-utils/fsck.c
View File

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

2
misc-utils/findmnt.c
View File

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

3
misc-utils/lsblk.c
View File

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

3
sys-utils/mount.c
View File

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

3
sys-utils/swapon-common.c
View File

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

3
sys-utils/umount.c
View File

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