28c28
< __FBSDID("$FreeBSD: head/sbin/fsck_ffs/suj.c 240463 2012-09-13 12:55:10Z zont $");
---
> __FBSDID("$FreeBSD: head/sbin/fsck_ffs/suj.c 241012 2012-09-27 23:30:58Z mdf $");
834,835c834,835
< printf("Clearing inode %d from parent %d at offset %jd\n",
< child, parent, diroff);
---
> printf("Clearing inode %ju from parent %ju at offset %jd\n",
> (uintmax_t)child, (uintmax_t)parent, diroff);
845,846c845,846
< errx(1, "Inode %d does not exist in %d at %jd",
< child, parent, diroff);
---
> errx(1, "Inode %ju does not exist in %ju at %jd",
> (uintmax_t)child, (uintmax_t)parent, diroff);
882,883c882,883
< printf("Directory %d has bad mode %o\n",
< parent, *mode);
---
> printf("Directory %ju has bad mode %o\n",
> (uintmax_t)parent, *mode);
885c885,886
< printf("Directory %d has zero mode\n", parent);
---
> printf("Directory %ju has zero mode\n",
> (uintmax_t)parent);
894c895
< printf("ino %d absent from %d due to offset %jd"
---
> printf("ino %ju absent from %ju due to offset %jd"
896c897,898
< child, parent, diroff, DIP(dip, di_size));
---
> (uintmax_t)child, (uintmax_t)parent, diroff,
> DIP(dip, di_size));
902c904
< printf("Sparse directory %d", parent);
---
> printf("Sparse directory %ju", (uintmax_t)parent);
921c923,924
< err_suj("Corrupt directory block in dir ino %d\n", parent);
---
> err_suj("Corrupt directory block in dir ino %ju\n",
> (uintmax_t)parent);
925,926c928,929
< printf("ino %d not found in %d, lbn %jd, dpoff %d\n",
< child, parent, lbn, dpoff);
---
> printf("ino %ju not found in %ju, lbn %jd, dpoff %d\n",
> (uintmax_t)child, (uintmax_t)parent, lbn, dpoff);
943,944c946,947
< printf("ino %d doesn't match dirent ino %d in parent %d\n",
< child, dp->d_ino, parent);
---
> printf("ino %ju doesn't match dirent ino %ju in parent %ju\n",
> (uintmax_t)child, (uintmax_t)dp->d_ino, (uintmax_t)parent);
980,981c983,984
< printf("blk %jd ino %d lbn %jd(%d) is not indir.\n",
< blk, ino, lbn, level);
---
> printf("blk %jd ino %ju lbn %jd(%d) is not indir.\n",
> blk, (uintmax_t)ino, lbn, level);
1134,1135c1137,1138
< printf("ino %d adjusting block count from %jd to %jd\n",
< ino, DIP(ip, di_blocks), blocks);
---
> printf("ino %ju adjusting block count from %jd to %jd\n",
> (uintmax_t)ino, DIP(ip, di_blocks), blocks);
1267,1268c1270,1271
< printf("Directory %d removing ino %d name %s\n",
< ino, dp->d_ino, dp->d_name);
---
> printf("Directory %ju removing ino %ju name %s\n",
> (uintmax_t)ino, (uintmax_t)dp->d_ino, dp->d_name);
1286,1287c1289,1290
< printf("Truncating and freeing ino %d, nlink %d, mode %o\n",
< ino, DIP(ip, di_nlink), DIP(ip, di_mode));
---
> printf("Truncating and freeing ino %ju, nlink %d, mode %o\n",
> (uintmax_t)ino, DIP(ip, di_nlink), DIP(ip, di_mode));
1331,1332c1334,1335
< printf("ino %d not enough links to live %d < %d\n",
< ino, nlink, reqlink);
---
> printf("ino %ju not enough links to live %d < %d\n",
> (uintmax_t)ino, nlink, reqlink);
1377c1380
< errx(1, "Directory %d name not found", ino);
---
> errx(1, "Directory %ju name not found", (uintmax_t)ino);
1401,1403c1404,1406
< err_suj(
< "ino %d nlink manipulation error, new link %d, old link %d\n",
< ino, nlink, DIP(ip, di_nlink));
---
> err_suj("ino %ju %s, new link %d, old link %d\n",
> (uintmax_t)ino, "nlink manipulation error", nlink,
> DIP(ip, di_nlink));
1405,1406c1408,1409
< printf("Adjusting ino %d, nlink %d, old link %d lastmode %o\n",
< ino, nlink, DIP(ip, di_nlink), sino->si_mode);
---
> printf("Adjusting ino %ju, nlink %d, old link %d lastmode %o\n",
> (uintmax_t)ino, nlink, DIP(ip, di_nlink), sino->si_mode);
1409c1412,1413
< printf("ino %d, zero inode freeing bitmap\n", ino);
---
> printf("ino %ju, zero inode freeing bitmap\n",
> (uintmax_t)ino);
1415c1419,1420
< printf("ino %d, mode %o != %o\n", ino, mode, sino->si_mode);
---
> printf("ino %ju, mode %o != %o\n",
> (uintmax_t)ino, mode, sino->si_mode);
1423,1424c1428,1429
< printf("ino %d not enough links to live %d < %d\n",
< ino, nlink, reqlink);
---
> printf("ino %ju not enough links to live %d < %d\n",
> (uintmax_t)ino, nlink, reqlink);
1431c1436,1437
< printf("ino %d, link matches, skipping.\n", ino);
---
> printf("ino %ju, link matches, skipping.\n",
> (uintmax_t)ino);
1530,1531c1536,1537
< printf("Truncating ino %d, mode %o to size %jd from size %jd\n",
< ino, mode, size, cursize);
---
> printf("Truncating ino %ju, mode %o to size %jd from size %jd\n",
> (uintmax_t)ino, mode, size, cursize);
1589c1595,1596
< err_suj("Bad blk at ino %d lbn %jd\n", ino, visitlbn);
---
> err_suj("Bad blk at ino %ju lbn %jd\n",
> (uintmax_t)ino, visitlbn);
1613,1614c1620,1621
< err_suj("Block missing from ino %d at lbn %jd\n",
< ino, visitlbn);
---
> err_suj("Block missing from ino %ju at lbn %jd\n",
> (uintmax_t)ino, visitlbn);
1659c1666
< printf("jrefrec: op %d ino %d, nlink %d, parent %d, "
---
> printf("jrefrec: op %d ino %ju, nlink %d, parent %d, "
1661,1663c1668,1670
< rrec->jr_op, rrec->jr_ino, rrec->jr_nlink,
< rrec->jr_parent, rrec->jr_diroff, rrec->jr_mode,
< isat, isdot);
---
> rrec->jr_op, (uintmax_t)rrec->jr_ino,
> rrec->jr_nlink, rrec->jr_parent, rrec->jr_diroff,
> rrec->jr_mode, isat, isdot);
1679,1680c1686,1687
< printf("ino %d nlink %d newlinks %d removes %d dotlinks %d\n",
< ino, nlink, newlinks, removes, dotlinks);
---
> printf("ino %ju nlink %d newlinks %d removes %d dotlinks %d\n",
> (uintmax_t)ino, nlink, newlinks, removes, dotlinks);
1721,1723c1728,1730
< printf("op %d blk %jd ino %d lbn %jd frags %d isat %d (%d)\n",
< brec->jb_op, blk, brec->jb_ino, brec->jb_lbn,
< brec->jb_frags, isat, frags);
---
> printf("op %d blk %jd ino %ju lbn %jd frags %d isat %d (%d)\n",
> brec->jb_op, blk, (uintmax_t)brec->jb_ino,
> brec->jb_lbn, brec->jb_frags, isat, frags);
1940c1947
< printf("Freeing unlinked ino %d mode %o\n",
---
> printf("Freeing unlinked ino %ju mode %o\n",
1944,1945c1951,1952
< printf("Skipping ino %d mode %o with link %d\n",
< ino, mode, DIP(ip, di_nlink));
---
> printf("Skipping ino %ju mode %o with link %d\n",
> (uintmax_t)ino, mode, DIP(ip, di_nlink));
2368,2369c2375,2376
< printf("Invalid link count %d for journal inode %d\n",
< DIP(ip, di_nlink), sujino);
---
> printf("Invalid link count %d for journal inode %ju\n",
> DIP(ip, di_nlink), (uintmax_t)sujino);
2375,2376c2382,2383
< printf("Invalid flags 0x%X for journal inode %d\n",
< DIP(ip, di_flags), sujino);
---
> printf("Invalid flags 0x%X for journal inode %ju\n",
> DIP(ip, di_flags), (uintmax_t)sujino);
2381,2382c2388,2389
< printf("Invalid mode %o for journal inode %d\n",
< DIP(ip, di_mode), sujino);
---
> printf("Invalid mode %o for journal inode %ju\n",
> DIP(ip, di_mode), (uintmax_t)sujino);
2387,2388c2394,2395
< printf("Invalid size %jd for journal inode %d\n",
< DIP(ip, di_size), sujino);
---
> printf("Invalid size %jd for journal inode %ju\n",
> DIP(ip, di_size), (uintmax_t)sujino);
2716,2717c2723,2724
< printf("** Reading %jd byte journal from inode %d.\n",
< DIP(jip, di_size), sujino);
---
> printf("** Reading %jd byte journal from inode %ju.\n",
> DIP(jip, di_size), (uintmax_t)sujino);
2721c2728
< printf("Sparse journal inode %d.\n", sujino);
---
> printf("Sparse journal inode %ju.\n", (uintmax_t)sujino);
< __FBSDID("$FreeBSD: head/sbin/fsck_ffs/suj.c 240463 2012-09-13 12:55:10Z zont $");
---
> __FBSDID("$FreeBSD: head/sbin/fsck_ffs/suj.c 241012 2012-09-27 23:30:58Z mdf $");
834,835c834,835
< printf("Clearing inode %d from parent %d at offset %jd\n",
< child, parent, diroff);
---
> printf("Clearing inode %ju from parent %ju at offset %jd\n",
> (uintmax_t)child, (uintmax_t)parent, diroff);
845,846c845,846
< errx(1, "Inode %d does not exist in %d at %jd",
< child, parent, diroff);
---
> errx(1, "Inode %ju does not exist in %ju at %jd",
> (uintmax_t)child, (uintmax_t)parent, diroff);
882,883c882,883
< printf("Directory %d has bad mode %o\n",
< parent, *mode);
---
> printf("Directory %ju has bad mode %o\n",
> (uintmax_t)parent, *mode);
885c885,886
< printf("Directory %d has zero mode\n", parent);
---
> printf("Directory %ju has zero mode\n",
> (uintmax_t)parent);
894c895
< printf("ino %d absent from %d due to offset %jd"
---
> printf("ino %ju absent from %ju due to offset %jd"
896c897,898
< child, parent, diroff, DIP(dip, di_size));
---
> (uintmax_t)child, (uintmax_t)parent, diroff,
> DIP(dip, di_size));
902c904
< printf("Sparse directory %d", parent);
---
> printf("Sparse directory %ju", (uintmax_t)parent);
921c923,924
< err_suj("Corrupt directory block in dir ino %d\n", parent);
---
> err_suj("Corrupt directory block in dir ino %ju\n",
> (uintmax_t)parent);
925,926c928,929
< printf("ino %d not found in %d, lbn %jd, dpoff %d\n",
< child, parent, lbn, dpoff);
---
> printf("ino %ju not found in %ju, lbn %jd, dpoff %d\n",
> (uintmax_t)child, (uintmax_t)parent, lbn, dpoff);
943,944c946,947
< printf("ino %d doesn't match dirent ino %d in parent %d\n",
< child, dp->d_ino, parent);
---
> printf("ino %ju doesn't match dirent ino %ju in parent %ju\n",
> (uintmax_t)child, (uintmax_t)dp->d_ino, (uintmax_t)parent);
980,981c983,984
< printf("blk %jd ino %d lbn %jd(%d) is not indir.\n",
< blk, ino, lbn, level);
---
> printf("blk %jd ino %ju lbn %jd(%d) is not indir.\n",
> blk, (uintmax_t)ino, lbn, level);
1134,1135c1137,1138
< printf("ino %d adjusting block count from %jd to %jd\n",
< ino, DIP(ip, di_blocks), blocks);
---
> printf("ino %ju adjusting block count from %jd to %jd\n",
> (uintmax_t)ino, DIP(ip, di_blocks), blocks);
1267,1268c1270,1271
< printf("Directory %d removing ino %d name %s\n",
< ino, dp->d_ino, dp->d_name);
---
> printf("Directory %ju removing ino %ju name %s\n",
> (uintmax_t)ino, (uintmax_t)dp->d_ino, dp->d_name);
1286,1287c1289,1290
< printf("Truncating and freeing ino %d, nlink %d, mode %o\n",
< ino, DIP(ip, di_nlink), DIP(ip, di_mode));
---
> printf("Truncating and freeing ino %ju, nlink %d, mode %o\n",
> (uintmax_t)ino, DIP(ip, di_nlink), DIP(ip, di_mode));
1331,1332c1334,1335
< printf("ino %d not enough links to live %d < %d\n",
< ino, nlink, reqlink);
---
> printf("ino %ju not enough links to live %d < %d\n",
> (uintmax_t)ino, nlink, reqlink);
1377c1380
< errx(1, "Directory %d name not found", ino);
---
> errx(1, "Directory %ju name not found", (uintmax_t)ino);
1401,1403c1404,1406
< err_suj(
< "ino %d nlink manipulation error, new link %d, old link %d\n",
< ino, nlink, DIP(ip, di_nlink));
---
> err_suj("ino %ju %s, new link %d, old link %d\n",
> (uintmax_t)ino, "nlink manipulation error", nlink,
> DIP(ip, di_nlink));
1405,1406c1408,1409
< printf("Adjusting ino %d, nlink %d, old link %d lastmode %o\n",
< ino, nlink, DIP(ip, di_nlink), sino->si_mode);
---
> printf("Adjusting ino %ju, nlink %d, old link %d lastmode %o\n",
> (uintmax_t)ino, nlink, DIP(ip, di_nlink), sino->si_mode);
1409c1412,1413
< printf("ino %d, zero inode freeing bitmap\n", ino);
---
> printf("ino %ju, zero inode freeing bitmap\n",
> (uintmax_t)ino);
1415c1419,1420
< printf("ino %d, mode %o != %o\n", ino, mode, sino->si_mode);
---
> printf("ino %ju, mode %o != %o\n",
> (uintmax_t)ino, mode, sino->si_mode);
1423,1424c1428,1429
< printf("ino %d not enough links to live %d < %d\n",
< ino, nlink, reqlink);
---
> printf("ino %ju not enough links to live %d < %d\n",
> (uintmax_t)ino, nlink, reqlink);
1431c1436,1437
< printf("ino %d, link matches, skipping.\n", ino);
---
> printf("ino %ju, link matches, skipping.\n",
> (uintmax_t)ino);
1530,1531c1536,1537
< printf("Truncating ino %d, mode %o to size %jd from size %jd\n",
< ino, mode, size, cursize);
---
> printf("Truncating ino %ju, mode %o to size %jd from size %jd\n",
> (uintmax_t)ino, mode, size, cursize);
1589c1595,1596
< err_suj("Bad blk at ino %d lbn %jd\n", ino, visitlbn);
---
> err_suj("Bad blk at ino %ju lbn %jd\n",
> (uintmax_t)ino, visitlbn);
1613,1614c1620,1621
< err_suj("Block missing from ino %d at lbn %jd\n",
< ino, visitlbn);
---
> err_suj("Block missing from ino %ju at lbn %jd\n",
> (uintmax_t)ino, visitlbn);
1659c1666
< printf("jrefrec: op %d ino %d, nlink %d, parent %d, "
---
> printf("jrefrec: op %d ino %ju, nlink %d, parent %d, "
1661,1663c1668,1670
< rrec->jr_op, rrec->jr_ino, rrec->jr_nlink,
< rrec->jr_parent, rrec->jr_diroff, rrec->jr_mode,
< isat, isdot);
---
> rrec->jr_op, (uintmax_t)rrec->jr_ino,
> rrec->jr_nlink, rrec->jr_parent, rrec->jr_diroff,
> rrec->jr_mode, isat, isdot);
1679,1680c1686,1687
< printf("ino %d nlink %d newlinks %d removes %d dotlinks %d\n",
< ino, nlink, newlinks, removes, dotlinks);
---
> printf("ino %ju nlink %d newlinks %d removes %d dotlinks %d\n",
> (uintmax_t)ino, nlink, newlinks, removes, dotlinks);
1721,1723c1728,1730
< printf("op %d blk %jd ino %d lbn %jd frags %d isat %d (%d)\n",
< brec->jb_op, blk, brec->jb_ino, brec->jb_lbn,
< brec->jb_frags, isat, frags);
---
> printf("op %d blk %jd ino %ju lbn %jd frags %d isat %d (%d)\n",
> brec->jb_op, blk, (uintmax_t)brec->jb_ino,
> brec->jb_lbn, brec->jb_frags, isat, frags);
1940c1947
< printf("Freeing unlinked ino %d mode %o\n",
---
> printf("Freeing unlinked ino %ju mode %o\n",
1944,1945c1951,1952
< printf("Skipping ino %d mode %o with link %d\n",
< ino, mode, DIP(ip, di_nlink));
---
> printf("Skipping ino %ju mode %o with link %d\n",
> (uintmax_t)ino, mode, DIP(ip, di_nlink));
2368,2369c2375,2376
< printf("Invalid link count %d for journal inode %d\n",
< DIP(ip, di_nlink), sujino);
---
> printf("Invalid link count %d for journal inode %ju\n",
> DIP(ip, di_nlink), (uintmax_t)sujino);
2375,2376c2382,2383
< printf("Invalid flags 0x%X for journal inode %d\n",
< DIP(ip, di_flags), sujino);
---
> printf("Invalid flags 0x%X for journal inode %ju\n",
> DIP(ip, di_flags), (uintmax_t)sujino);
2381,2382c2388,2389
< printf("Invalid mode %o for journal inode %d\n",
< DIP(ip, di_mode), sujino);
---
> printf("Invalid mode %o for journal inode %ju\n",
> DIP(ip, di_mode), (uintmax_t)sujino);
2387,2388c2394,2395
< printf("Invalid size %jd for journal inode %d\n",
< DIP(ip, di_size), sujino);
---
> printf("Invalid size %jd for journal inode %ju\n",
> DIP(ip, di_size), (uintmax_t)sujino);
2716,2717c2723,2724
< printf("** Reading %jd byte journal from inode %d.\n",
< DIP(jip, di_size), sujino);
---
> printf("** Reading %jd byte journal from inode %ju.\n",
> DIP(jip, di_size), (uintmax_t)sujino);
2721c2728
< printf("Sparse journal inode %d.\n", sujino);
---
> printf("Sparse journal inode %ju.\n", (uintmax_t)sujino);