Skip to content

Commit

Permalink
Refactor libzfs_error_init newlines
Browse files Browse the repository at this point in the history
Move the trailing newlines from the error message strings to the format
strings to more closely match the other error messages.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes #9330
  • Loading branch information
Ryan Moeller authored and behlendorf committed Sep 18, 2019
1 parent dd262c9 commit afc8f0a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion cmd/mount_zfs/mount_zfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ main(int argc, char **argv)
zfsutil = 1;

if ((g_zfs = libzfs_init()) == NULL) {
(void) fprintf(stderr, "%s", libzfs_error_init(errno));
(void) fprintf(stderr, "%s\n", libzfs_error_init(errno));
return (MOUNT_SYSERR);
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/zfs/zfs_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -8308,7 +8308,7 @@ main(int argc, char **argv)
return (zfs_do_version(argc, argv));

if ((g_zfs = libzfs_init()) == NULL) {
(void) fprintf(stderr, "%s", libzfs_error_init(errno));
(void) fprintf(stderr, "%s\n", libzfs_error_init(errno));
return (1);
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/zinject/zinject.c
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ main(int argc, char **argv)
uint32_t dvas = 0;

if ((g_zfs = libzfs_init()) == NULL) {
(void) fprintf(stderr, "%s", libzfs_error_init(errno));
(void) fprintf(stderr, "%s\n", libzfs_error_init(errno));
return (1);
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/zpool/zpool_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -9757,7 +9757,7 @@ main(int argc, char **argv)
return (zpool_do_version(argc, argv));

if ((g_zfs = libzfs_init()) == NULL) {
(void) fprintf(stderr, "%s", libzfs_error_init(errno));
(void) fprintf(stderr, "%s\n", libzfs_error_init(errno));
return (1);
}

Expand Down
10 changes: 5 additions & 5 deletions lib/libzfs/libzfs_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,21 @@ libzfs_error_init(int error)
case ENXIO:
return (dgettext(TEXT_DOMAIN, "The ZFS modules are not "
"loaded.\nTry running '/sbin/modprobe zfs' as root "
"to load them.\n"));
"to load them."));
case ENOENT:
return (dgettext(TEXT_DOMAIN, "/dev/zfs and /proc/self/mounts "
"are required.\nTry running 'udevadm trigger' and 'mount "
"-t proc proc /proc' as root.\n"));
"-t proc proc /proc' as root."));
case ENOEXEC:
return (dgettext(TEXT_DOMAIN, "The ZFS modules cannot be "
"auto-loaded.\nTry running '/sbin/modprobe zfs' as "
"root to manually load them.\n"));
"root to manually load them."));
case EACCES:
return (dgettext(TEXT_DOMAIN, "Permission denied the "
"ZFS utilities must be run as root.\n"));
"ZFS utilities must be run as root."));
default:
return (dgettext(TEXT_DOMAIN, "Failed to initialize the "
"libzfs library.\n"));
"libzfs library."));
}
}

Expand Down

0 comments on commit afc8f0a

Please sign in to comment.