fuse2fs: clean up error messages

Instead of horridly line-wrapping multi-line messages that are printed
during mounting, let's just expand them to be one source code line per
printed line.  This will make it a lot easier for someone who sees the
these errors to grep the source code to find out where they came from.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/174786677603.1383760.817536477752866097.stgit@frogsfrogsfrogs
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index 5b880915563cde9a7f184980376f94e11c636c03..d4aeb6ae63e85f5a5b15a66ab089cd89e321653c 100644 (file)
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -4035,8 +4035,7 @@ int main(int argc, char *argv[])
        if (ext2fs_has_feature_journal_needs_recovery(global_fs->super)) {
                if (fctx.norecovery) {
                        log_printf(&fctx, "%s\n",
-                                  _("Mounting read-only without "
-                                    "recovering journal."));
+ _("Mounting read-only without recovering journal."));
                        fctx.ro = 1;
                        global_fs->flags &= ~EXT2_FLAG_RW;
                } else {
@@ -4055,13 +4054,10 @@ int main(int argc, char *argv[])
 
        if (global_fs->flags & EXT2_FLAG_RW) {
                if (ext2fs_has_feature_journal(global_fs->super))
-                       log_printf(&fctx, "%s\n",
-                                  _("Warning: fuse2fs does not support "
-                                    "using the\n"
-                                    "journal.  There may be file system "
-                                    "corruption or data loss if\n"
-                                    "the file system is not gracefully "
-                                    "unmounted.\n"));
+                       log_printf(&fctx, "%s",
+ _("Warning: fuse2fs does not support using the journal.\n"
+   "There may be file system corruption or data loss if\n"
+   "the file system is not gracefully unmounted.\n"));
                err = ext2fs_read_inode_bitmap(global_fs);
                if (err) {
                        translate_error(global_fs, 0, err);