Refactor libzfs_error_init newlines

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

diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
index a9b1e166b4b0058d5da3cea81c938e66c46b499a..a37dd6f53a1682832156efb64221af68037dd0a1 100644 (file)
--- a/cmd/mount_zfs/mount_zfs.c
+++ b/cmd/mount_zfs/mount_zfs.c
@@ -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);
        }
 

diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index e6b5978259d607ef632ba9466a3cd7ffa2b9a734..62c5bcca44daf11d6b333b5464c7ddf400f61924 100644 (file)
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -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);
        }
 

diff --git a/cmd/zinject/zinject.c b/cmd/zinject/zinject.c
index cff7f861a2e346b4b7c2e34853866cf7f5ad5762..1795bfd4506cd53ffe760b53e8d5a77b7c29a7f8 100644 (file)
--- a/cmd/zinject/zinject.c
+++ b/cmd/zinject/zinject.c
@@ -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);
        }
 

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index 5ffde8bf375652465198247405e08a749f606c43..c28560a15f7eab16beea69c515772fe405e5cdff 100644 (file)
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -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);
        }
 

diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c
index 27d630d4f51f1f7e113a3f3b0a033f783b05886b..de4d8bff9ae1243ca3fac0d375ea199e1b394be6 100644 (file)
--- a/lib/libzfs/libzfs_util.c
+++ b/lib/libzfs/libzfs_util.c
@@ -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."));
        }
 }