xfsprogs: fix various incorrect printf formats

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reported-by: Jakub Bogusz <qboosh@pld-linux.org>
Reviewed-by: Jakub Bogusz <qboosh@pld-linux.org>

diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c
index e278f97e8e5b178d151b17a78fdd8e1968cb8b5b..25339b1c922a579fdb83e5bb790ad25bc1539cc2 100644 (file)
--- a/libxfs/freebsd.c
+++ b/libxfs/freebsd.c
@@ -126,15 +126,13 @@ platform_findsizes(char *path, int fd, long long *sz, int *bsz)
        }
 
        if ((st.st_mode & S_IFMT) != S_IFCHR) {
-               fprintf(stderr, _("%s: "
-                       "Not a device or file: \"%s\"n"),
+               fprintf(stderr, _("%s: Not a device or file: \"%s\"\n"),
                        progname, path);
                exit(1);
        }
 
        if (ioctl(fd, DIOCGMEDIASIZE, &size) != 0) {
-               fprintf(stderr, _("%s: "
-                       "DIOCGMEDIASIZE failed on \"%s\": %s\n"),
+               fprintf(stderr, _("%s: DIOCGMEDIASIZE failed on \"%s\": %s\n"),
                        progname, path, strerror(errno));
                exit(1);
        }

diff --git a/repair/dinode.c b/repair/dinode.c
index fb5e53aa7b3d77438c06c2af35a34f2151da7ce3..9c5db9910fd339f73cacc2985a7c22cb3dae40a6 100644 (file)
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -1439,7 +1439,7 @@ _("mismatch between format (%d) and size (%" PRId64 ") in symlink ino %" PRIu64
        }
        if (dino->di_format == XFS_DINODE_FMT_LOCAL) {
                do_warn(
-_("mismatch between format (%d) and size (%" PRId64 ") in symlink inode %" PRIu64 "n"),
+_("mismatch between format (%d) and size (%" PRId64 ") in symlink inode %" PRIu64 "\n"),
                        dino->di_format,
                        (__int64_t)be64_to_cpu(dino->di_size), lino);
                return 1;

diff --git a/repair/dir2.c b/repair/dir2.c
index 341d870d802d92af2afc25a3ee87e179047ab955..7164f7fc41bc04429ea984530e9c9794d79cf648 100644 (file)
--- a/repair/dir2.c
+++ b/repair/dir2.c
@@ -1174,7 +1174,7 @@ _("would have corrected entry count in directory %" PRIu64 " from %d to %d\n"),
                                ino, sfp->hdr.count, i);
                } else {
                        do_warn(
-_("corrected entry count in directory %" PRIu64 "u, was %d, now %d\n"),
+_("corrected entry count in directory %" PRIu64 ", was %d, now %d\n"),
                                ino, sfp->hdr.count, i);
                        sfp->hdr.count = i;
                        *dino_dirty = 1;

diff --git a/repair/phase6.c b/repair/phase6.c
index adad61dee372b3915caeee56d22c8bcfa2544a2d..1c82cb1914c6f920c98de9c9121defb0ee65faad 100644 (file)
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -2071,7 +2071,7 @@ longform_dir2_entry_check_data(
                if (is_inode_free(irec, ino_offset))  {
                        nbad++;
                        if (entry_junked(
-       _("entry \"%s\" in directory inode %" PRIu64 " points to free inode " PRIu64),
+       _("entry \"%s\" in directory inode %" PRIu64 " points to free inode %" PRIu64),
                                        fname, ip->i_ino, inum)) {
                                dep->name[0] = '/';
                                libxfs_dir2_data_log_entry(tp, bp, dep);

diff --git a/repair/scan.c b/repair/scan.c
index aa2fbfee4f8a76469eee417d70863291d7377f2f..69f3ecd30fba01fcf67e20aa4adc1e36eb39c6de 100644 (file)
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -289,14 +289,14 @@ _("bad back (left) sibling pointer (saw %llu should be NULL (0))\n"
                         */
                        set_bmap(agno, agbno, XR_E_MULT);
                        do_warn(
-_("inode 0x%" PRIu64 "bmap block 0x%" PRIu64 " claimed, state is %d\n"),
+_("inode 0x%" PRIu64 "bmap block 0x%" PRIx64 " claimed, state is %d\n"),
                                ino, bno, state);
                        break;
                case XR_E_MULT:
                case XR_E_INUSE_FS:
                        set_bmap(agno, agbno, XR_E_MULT);
                        do_warn(
-_("inode 0x%" PRIu64 " bmap block 0x%" PRIu64 " claimed, state is %d\n"),
+_("inode 0x%" PRIu64 " bmap block 0x%" PRIx64 " claimed, state is %d\n"),
                                ino, bno, state);
                        /*
                         * if we made it to here, this is probably a bmap block
@@ -311,7 +311,7 @@ _("inode 0x%" PRIu64 " bmap block 0x%" PRIu64 " claimed, state is %d\n"),
                case XR_E_BAD_STATE:
                default:
                        do_warn(
-_("bad state %d, inode 0x%" PRIu64 " bmap block 0x%" PRIu64 "\n"),
+_("bad state %d, inode 0x%" PRIu64 " bmap block 0x%" PRIx64 "\n"),
                                state, ino, bno);
                        break;
                }
@@ -338,7 +338,7 @@ _("bad state %d, inode 0x%" PRIu64 " bmap block 0x%" PRIu64 "\n"),
                if (numrecs > mp->m_bmap_dmxr[0] || (isroot == 0 && numrecs <
                                                        mp->m_bmap_dmnr[0])) {
                                do_warn(
-_("inode 0x%" PRIu64 " bad # of bmap records (%u, min - %u, max - %u)\n"),
+_("inode %" PRIu64 " bad # of bmap records (%u, min - %u, max - %u)\n"),
                                        ino, numrecs, mp->m_bmap_dmnr[0],
                                        mp->m_bmap_dmxr[0]);
                        return(1);