Index: misc/jojodiff/Makefile =================================================================== --- misc/jojodiff/Makefile +++ misc/jojodiff/Makefile @@ -12,24 +12,24 @@ LICENSE= GPLv3+ -USES= gmake tar:tgz -MAKE_ARGS= CC="${CC}" CPP="${CXX}" CFLAGS="${CFLAGS}" +USES= dos2unix gmake tar:tgz +DOS2UNIX_FILES= JDebug.cpp JDebug.h JDefs.h JDiff.cpp JDiff.h JFile.h \ + JFileAhead.cpp JFileAhead.h JFileIStream.cpp JFileIStream.h \ + JFileIStreamAhead.cpp JFileIStreamAhead.h JHashPos.cpp \ + JHashPos.h JMatchTable.cpp JMatchTable.h JOut.h JOutAsc.cpp \ + JOutAsc.h JOutBin.cpp JOutBin.h JOutRgn.cpp JOutRgn.h \ + jpatch.cpp Makefile +MAKE_ARGS= CC="${CC}" \ + CFLAGS="${CFLAGS}" \ + CPP="${CXX}" WRKSRC_SUBDIR= src -PLIST_FILES= bin/jdiff bin/jptch -PORTDOCS= readme.txt readme.htm +PLIST_FILES= bin/jdiff \ + bin/jptch +PORTDOCS= readme.htm readme.txt OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -E 's,P(RI|8)(zd|hkey), & ,g' \ - ${WRKSRC}/JFileAhead.cpp ${WRKSRC}/JFileIStreamAhead.cpp \ - ${WRKSRC}/JHashPos.cpp ${WRKSRC}/JOutAsc.cpp \ - ${WRKSRC}/JOutRgn.cpp ${WRKSRC}/jpatch.cpp \ - ${WRKSRC}/main.cpp - @${REINPLACE_CMD} -e 's,is %d bit,is %zu bit,' \ - ${WRKSRC}/jpatch.cpp ${WRKSRC}/main.cpp - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/j???? ${STAGEDIR}${PREFIX}/bin Index: misc/jojodiff/files/patch-JFileAhead.cpp =================================================================== --- /dev/null +++ misc/jojodiff/files/patch-JFileAhead.cpp @@ -0,0 +1,74 @@ +--- JFileAhead.cpp.orig 2020-02-07 13:28:01 UTC ++++ JFileAhead.cpp +@@ -75,7 +75,7 @@ int JFileAhead::get ( + miRedSze--; + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%s,"P8zd",%d)->%2x (mem %p).\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%s," P8zd ",%d)->%2x (mem %p).\n", + msFid, azPos, aiTyp, *mpRed, mpRed); + #endif + return *mpRed++; +@@ -117,7 +117,7 @@ int JFileAhead::get_frombuffer ( + + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%s,"P8zd",%d)->%2x (mem %p).\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%s," P8zd ",%d)->%2x (mem %p).\n", + msFid, azPos, aiTyp, *lpDta, lpDta); + #endif + +@@ -146,7 +146,7 @@ int JFileAhead::get_frombuffer ( + /* eof */ + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%s,"P8zd",%d)->EOF (mem).\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%s," P8zd ",%d)->EOF (mem).\n", + msFid, azPos, aiTyp); + #endif + +@@ -164,7 +164,7 @@ int JFileAhead::get_frombuffer ( + if (aiTyp == 2 && liSek != 0) { + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%p,"P8zd",%d)->EOB.\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%p," P8zd ",%d)->EOB.\n", + msFid, azPos, aiTyp); + #endif + return EOB ; +@@ -269,7 +269,7 @@ int JFileAhead::get_outofbuffer ( + + if (aiSek != 0) { + #if debug +- if (JDebug::gbDbg[DBGBUF]) fprintf(JDebug::stddbg, "ufFabGet: Seek %"PRIzd".\n", azPos); ++ if (JDebug::gbDbg[DBGBUF]) fprintf(JDebug::stddbg, "ufFabGet: Seek %" PRIzd ".\n", azPos); + #endif + + mlFabSek++ ; +@@ -283,7 +283,7 @@ int JFileAhead::get_outofbuffer ( + if (liDne < liTdo) { + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%p,"P8zd",%d)->EOF.\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%p," P8zd ",%d)->EOF.\n", + msFid, azPos, aiTyp); + #endif + +@@ -293,7 +293,7 @@ int JFileAhead::get_outofbuffer ( + } + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%s,"P8zd",%d)->%2x (sto %p).\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%s," P8zd ",%d)->%2x (sto %p).\n", + msFid, azPos, aiTyp, *mpInp, mpInp); + #endif + +@@ -326,7 +326,7 @@ int JFileAhead::get_outofbuffer ( + if ( mpInp == mpMax ){ + mpInp = mpBuf ; + } else if ( mpInp > mpMax ) { +- fprintf(stderr, "Buffer out of bounds on position %"PRIzd")!", azPos); ++ fprintf(stderr, "Buffer out of bounds on position %" PRIzd ")!", azPos); + exit(6); + } + if ( miBufUsd < mlBufSze ) miBufUsd += liDne ; Index: misc/jojodiff/files/patch-JFileIStreamAhead.cpp =================================================================== --- /dev/null +++ misc/jojodiff/files/patch-JFileIStreamAhead.cpp @@ -0,0 +1,74 @@ +--- JFileIStreamAhead.cpp.orig 2020-02-07 13:28:01 UTC ++++ JFileIStreamAhead.cpp +@@ -80,7 +80,7 @@ int JFileIStreamAhead::get ( + miRedSze--; + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%s,"P8zd",%d)->%2x (mem %p).\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%s," P8zd ",%d)->%2x (mem %p).\n", + msFid, azPos, aiTyp, *mpRed, mpRed); + #endif + return *mpRed++; +@@ -122,7 +122,7 @@ int JFileIStreamAhead::get_frombuffer ( + + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%s,"P8zd",%d)->%2x (mem %p).\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%s," P8zd ",%d)->%2x (mem %p).\n", + msFid, azPos, aiTyp, *lpDta, lpDta); + #endif + +@@ -151,7 +151,7 @@ int JFileIStreamAhead::get_frombuffer ( + /* eof */ + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%s,"P8zd",%d)->EOF (mem).\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%s," P8zd ",%d)->EOF (mem).\n", + msFid, azPos, aiTyp); + #endif + +@@ -169,7 +169,7 @@ int JFileIStreamAhead::get_frombuffer ( + if (aiTyp == 2 && liSek != 0) { + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%p,"P8zd",%d)->EOB.\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%p," P8zd ",%d)->EOB.\n", + msFid, azPos, aiTyp); + #endif + return EOB ; +@@ -268,7 +268,7 @@ int JFileIStreamAhead::get_outofbuffer ( + + if (aiSek != 0) { + #if debug +- if (JDebug::gbDbg[DBGBUF]) fprintf(JDebug::stddbg, "ufFabGet: Seek %"PRIzd".\n", azPos); ++ if (JDebug::gbDbg[DBGBUF]) fprintf(JDebug::stddbg, "ufFabGet: Seek %" PRIzd ".\n", azPos); + #endif + + mlFabSek++ ; +@@ -281,7 +281,7 @@ int JFileIStreamAhead::get_outofbuffer ( + if (liDne < liTdo) { + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%p,"P8zd",%d)->EOF.\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%p," P8zd ",%d)->EOF.\n", + msFid, azPos, aiTyp); + #endif + // TODO reduce number of times we pass here, init mzPosEof to MAX_OFF_T +@@ -295,7 +295,7 @@ int JFileIStreamAhead::get_outofbuffer ( + } + #if debug + if (JDebug::gbDbg[DBGRED]) +- fprintf(JDebug::stddbg, "ufFabGet(%s,"P8zd",%d)->%2x (sto %p).\n", ++ fprintf(JDebug::stddbg, "ufFabGet(%s," P8zd ",%d)->%2x (sto %p).\n", + msFid, azPos, aiTyp, *mpInp, mpInp); + #endif + +@@ -325,7 +325,7 @@ int JFileIStreamAhead::get_outofbuffer ( + if ( mpInp == mpMax ){ + mpInp = mpBuf ; + } else if ( mpInp > mpMax ) { +- fprintf(stderr, "Buffer out of bounds on position %"PRIzd")!", azPos); ++ fprintf(stderr, "Buffer out of bounds on position %" PRIzd ")!", azPos); + exit(6); + } + if ( miBufUsd < mlBufSze ) miBufUsd += liDne ; Index: misc/jojodiff/files/patch-JHashPos.cpp =================================================================== --- /dev/null +++ misc/jojodiff/files/patch-JHashPos.cpp @@ -0,0 +1,29 @@ +--- JHashPos.cpp.orig 2020-02-07 13:28:01 UTC ++++ JHashPos.cpp +@@ -124,7 +124,7 @@ void JHashPos::add (hkey akCurHsh, off_t azPos, int ai + /* debug */ + #if debug + if (JDebug::gbDbg[DBGHSH]) +- fprintf(JDebug::stddbg, "Hash Add %8d " P8zd " %8"PRIhkey" %c\n", ++ fprintf(JDebug::stddbg, "Hash Add %8d " P8zd " %8" PRIhkey " %c\n", + liIdx, azPos, akCurHsh, + (mkHshTblHsh[liIdx] == 0)?'.':'!'); + #endif +@@ -165,7 +165,7 @@ void JHashPos::print(){ + + for (liHshIdx = 0; liHshIdx < miHshPme; liHshIdx ++) { + if (mzHshTblPos[liHshIdx] != 0) { +- fprintf(JDebug::stddbg, "Hash Pnt %12d "P8zd"-%08"PRIhkey"x\n", liHshIdx, ++ fprintf(JDebug::stddbg, "Hash Pnt %12d " P8zd "-%08" PRIhkey "x\n", liHshIdx, + mzHshTblPos[liHshIdx], mkHshTblHsh[liHshIdx]) ; + } + } +@@ -213,7 +213,7 @@ void JHashPos::dist(off_t azMax, int aiBck){ + if (liBckCnt[liIdx] < liMin) liMin = liBckCnt[liIdx] ; + if (liBckCnt[liIdx] > liMax) liMax = liBckCnt[liIdx] ; + +- fprintf(JDebug::stddbg, "Hash Dist %8d Pos=" P8zd ":" P8zd " Cnt=%8d Rlb=%d\n", ++ fprintf(JDebug::stddbg, "Hash Dist %8d Pos=" P8zd ":" P8zd " Cnt=%8d Rlb=%d\n", + liIdx, (off_t) liIdx * liHshDiv, (off_t) (liIdx + 1) * liHshDiv, liBckCnt[liIdx], + (liBckCnt[liIdx]==0)?-1:liHshDiv / liBckCnt[liIdx]) ; + } Index: misc/jojodiff/files/patch-JOutAsc.cpp =================================================================== --- /dev/null +++ misc/jojodiff/files/patch-JOutAsc.cpp @@ -0,0 +1,31 @@ +--- JOutAsc.cpp.orig 2020-02-07 13:28:01 UTC ++++ JOutAsc.cpp +@@ -44,8 +44,8 @@ bool JOutAsc::put ( + + if (aiOpr == ESC) return false ; + +- fprintf(mpFilOut, P8zd" ", azPosOrg) ; +- fprintf(mpFilOut, P8zd" ", azPosNew) ; ++ fprintf(mpFilOut, P8zd " ", azPosOrg) ; ++ fprintf(mpFilOut, P8zd " ", azPosNew) ; + + switch (aiOpr) { + case (MOD) : +@@ -74,7 +74,7 @@ bool JOutAsc::put ( + break; + + case (DEL) : +- fprintf(mpFilOut, "DEL %"PRIzd"\n", azLen); ++ fprintf(mpFilOut, "DEL %" PRIzd "\n", azLen); + + liOprCur=DEL; + gzOutBytCtl+=2+ufPutSze(azLen); +@@ -82,7 +82,7 @@ bool JOutAsc::put ( + break; + + case (BKT) : +- fprintf(mpFilOut, "BKT %"PRIzd"\n", azLen); ++ fprintf(mpFilOut, "BKT %" PRIzd "\n", azLen); + + liOprCur=BKT; + gzOutBytCtl+=2+ufPutSze(azLen); Index: misc/jojodiff/files/patch-JOutRgn.cpp =================================================================== --- /dev/null +++ misc/jojodiff/files/patch-JOutRgn.cpp @@ -0,0 +1,39 @@ +--- JOutRgn.cpp.orig 2020-02-07 13:28:01 UTC ++++ JOutRgn.cpp +@@ -46,31 +46,31 @@ bool JOutRgn::put ( + case (MOD) : + gzOutBytCtl+=2; + gzOutBytDta+=szOprCnt ; +- fprintf(mpFilOut, P8zd " " P8zd " MOD %"PRIzd"\n", azPosOrg - szOprCnt, azPosNew - szOprCnt, szOprCnt) ; ++ fprintf(mpFilOut, P8zd " " P8zd " MOD %" PRIzd "\n", azPosOrg - szOprCnt, azPosNew - szOprCnt, szOprCnt) ; + break; + + case (INS) : + gzOutBytCtl+=2; + gzOutBytDta+=szOprCnt ; +- fprintf(mpFilOut, P8zd " " P8zd " INS %"PRIzd"\n", azPosOrg, azPosNew - szOprCnt, szOprCnt) ; ++ fprintf(mpFilOut, P8zd " " P8zd " INS %" PRIzd "\n", azPosOrg, azPosNew - szOprCnt, szOprCnt) ; + break; + + case (DEL) : + gzOutBytCtl+=2; + gzOutBytDel+=szOprCnt; +- fprintf(mpFilOut, P8zd " " P8zd " DEL %"PRIzd"\n", azPosOrg - szOprCnt, azPosNew, szOprCnt); ++ fprintf(mpFilOut, P8zd " " P8zd " DEL %" PRIzd "\n", azPosOrg - szOprCnt, azPosNew, szOprCnt); + break; + + case (BKT) : + gzOutBytCtl+=2; + gzOutBytBkt+=szOprCnt; +- fprintf(mpFilOut, P8zd " " P8zd " BKT %"PRIzd"\n", azPosOrg + szOprCnt, azPosNew, szOprCnt); ++ fprintf(mpFilOut, P8zd " " P8zd " BKT %" PRIzd "\n", azPosOrg + szOprCnt, azPosNew, szOprCnt); + break; + + case (EQL) : + gzOutBytCtl+=2; + gzOutBytEql+=szOprCnt ; +- fprintf(mpFilOut, P8zd " " P8zd " EQL %"PRIzd"\n", azPosOrg - szOprCnt, azPosNew - szOprCnt, szOprCnt); ++ fprintf(mpFilOut, P8zd " " P8zd " EQL %" PRIzd "\n", azPosOrg - szOprCnt, azPosNew - szOprCnt, szOprCnt); + break; + } + Index: misc/jojodiff/files/patch-jpatch.cpp =================================================================== --- /dev/null +++ misc/jojodiff/files/patch-jpatch.cpp @@ -0,0 +1,136 @@ +--- jpatch.cpp.orig 2020-02-07 13:28:01 UTC ++++ jpatch.cpp +@@ -127,7 +127,7 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + case MOD: + liOpr = MOD; + if (giVerbse == 1) { +- fprintf(stddbg, ""P8zd" "P8zd" MOD ... \n", ftell(asFilOrg)+lzMod-1, ftell(asFilOut)) ; ++ fprintf(stddbg, "" P8zd " " P8zd " MOD ... \n", ftell(asFilOrg)+lzMod-1, ftell(asFilOut)) ; + } + lbChg = true; + break ; +@@ -135,7 +135,7 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + case INS: + liOpr = INS; + if (giVerbse == 1) { +- fprintf(stddbg, ""P8zd" "P8zd" INS ... \n", ++ fprintf(stddbg, "" P8zd " " P8zd " INS ... \n", + ftell(asFilOrg)+lzMod-1, ftell(asFilOut)) ; + } + lbChg = true; +@@ -145,12 +145,12 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + liOpr = DEL; + lzOff = ufGetInt(asFilPch); + if (giVerbse >= 1) { +- fprintf(stddbg, ""P8zd" "P8zd" DEL %"PRIzd"\n", ++ fprintf(stddbg, "" P8zd " " P8zd " DEL %" PRIzd "\n", + ftell(asFilOrg)+lzMod, ftell(asFilOut), lzOff) ; + } + + if (fseek(asFilOrg, lzOff + lzMod, SEEK_CUR) != 0) { +- fprintf(stderr, "Could not position on original file (seek %"PRIzd" + %"PRIzd").\n", lzOff, lzMod); ++ fprintf(stderr, "Could not position on original file (seek %" PRIzd " + %" PRIzd ").\n", lzOff, lzMod); + exit(EXI_SEK); + } + lzMod = 0; +@@ -161,13 +161,13 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + liOpr = EQL; + lzOff = ufGetInt(asFilPch); + if (giVerbse >= 1) { +- fprintf(stddbg, ""P8zd" "P8zd" EQL %"PRIzd"\n", ++ fprintf(stddbg, "" P8zd " " P8zd " EQL %" PRIzd "\n", + ftell(asFilOrg)+lzMod, ftell(asFilOut), lzOff) ; + } + + if (lzMod > 0) { + if (fseek(asFilOrg, lzMod, SEEK_CUR) != 0) { +- fprintf(stderr, "Could not position on original file (skip %"PRIzd").\n", lzMod); ++ fprintf(stderr, "Could not position on original file (skip %" PRIzd ").\n", lzMod); + exit(EXI_SEK); + } + lzMod = 0; +@@ -200,12 +200,12 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + liOpr = BKT ; + lzOff = ufGetInt(asFilPch) ; + if (giVerbse >= 1) { +- fprintf(stddbg, ""P8zd" "P8zd" BKT %"PRIzd"\n", ++ fprintf(stddbg, "" P8zd " " P8zd " BKT %" PRIzd "\n", + ftell(asFilOrg)+lzMod, ftell(asFilOut), lzOff) ; + } + + if (fseek(asFilOrg, lzMod - lzOff, SEEK_CUR) != 0) { +- fprintf(stderr, "Could not position on original file (seek back %"PRIzd" - %"PRIzd").\n", ++ fprintf(stderr, "Could not position on original file (seek back %" PRIzd " - %" PRIzd ").\n", + lzMod, lzOff); + exit(EXI_SEK); + } +@@ -215,14 +215,14 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + + case ESC: + if (giVerbse > 2) { +- fprintf(stddbg, ""P8zd" "P8zd" ESC ESC\n", ++ fprintf(stddbg, "" P8zd " " P8zd " ESC ESC\n", + ftell(asFilOrg)+lzMod, ftell(asFilOut)) ; + } + break; + + default: + if (giVerbse > 2) { +- fprintf(stddbg, ""P8zd" "P8zd" ESC XXX\n", ++ fprintf(stddbg, "" P8zd " " P8zd " ESC XXX\n", + ftell(asFilOrg)+lzMod, ftell(asFilOut)) ; + } + lbEsc = true; +@@ -242,7 +242,7 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + putc(ESC, asFilOut) ; + lzMod ++ ; + if (giVerbse > 2) { +- fprintf(stddbg, P8zd" "P8zd" MOD %3o ESC\n", ++ fprintf(stddbg, P8zd " " P8zd " MOD %3o ESC\n", + ftell(asFilOrg)+lzMod-1, ftell(asFilOut)-1, ESC) ; + } + } +@@ -250,7 +250,7 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + putc(liInp, asFilOut) ; + lzMod ++ ; + if (giVerbse > 2) { +- fprintf(stddbg, P8zd" "P8zd" MOD %3o %c\n", ++ fprintf(stddbg, P8zd " " P8zd " MOD %3o %c\n", + ftell(asFilOrg)+lzMod-1, ftell(asFilOut)-1, liInp, + ((liInp >= 32 && liInp <= 127)?(char) liInp:' ')) ; + } +@@ -259,14 +259,14 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + case INS : + if (lbEsc) { + if (giVerbse > 2) { +- fprintf(stddbg, P8zd" "P8zd" INS %3o ESC\n", ++ fprintf(stddbg, P8zd " " P8zd " INS %3o ESC\n", + ftell(asFilOrg)+lzMod-1, ftell(asFilOut), ESC) ; + } + putc(ESC, asFilOut) ; + } + + if (giVerbse > 2) { +- fprintf(stddbg, P8zd" "P8zd" INS %3o %c\n", ++ fprintf(stddbg, P8zd " " P8zd " INS %3o %c\n", + ftell(asFilOrg)+lzMod-1, ftell(asFilOut), liInp, + ((liInp >= 32 && liInp <= 127)?(char) liInp:' ')) ; + } +@@ -280,7 +280,7 @@ void jpatch ( FILE *asFilOrg, FILE *asFilPch, FILE *as + } /* while */ + + if (giVerbse > 1) { +- fprintf(stddbg, P8zd" "P8zd" EOF", ++ fprintf(stddbg, P8zd " " P8zd " EOF", + ftell(asFilOrg)+lzMod, ftell(asFilOut)) ; + } + } +@@ -344,7 +344,7 @@ int main(int aiArgCnt, char *acArg[]) + fprintf(stddbg, "You should have received a copy of the GNU General Public License\n"); + fprintf(stddbg, "along with this program. If not, see .\n"); + fprintf(stddbg, "\n"); +- fprintf(stddbg, "File adressing is %d bit.\n", sizeof(off_t) * 8) ; ++ fprintf(stddbg, "File adressing is %zu bit.\n", sizeof(off_t) * 8) ; + fprintf(stddbg, "\n"); + } + Index: misc/jojodiff/files/patch-main.cpp =================================================================== --- /dev/null +++ misc/jojodiff/files/patch-main.cpp @@ -0,0 +1,34 @@ +--- main.cpp.orig 2011-12-03 15:38:06 UTC ++++ main.cpp +@@ -315,7 +315,7 @@ int main(int aiArgCnt, char *acArg[]) + maxoff_t_gb = maxoff_t_gb >> 10 ; + maxoff_t_mul = "TB"; + } +- fprintf(JDebug::stddbg, "File adressing is %d bit (files up to %"PRIzd" %s), samples are %d bytes.\n\n", ++ fprintf(JDebug::stddbg, "File adressing is %zu bit (files up to %" PRIzd " %s), samples are %d bytes.\n\n", + sizeof(off_t) * 8, maxoff_t_gb, maxoff_t_mul, SMPSZE) ; + } + +@@ -481,15 +481,15 @@ int main(int aiArgCnt, char *acArg[]) + fprintf(JDebug::stddbg, "Hashtable overloading = %d\n", loJDiff.getHsh()->get_hashcolmax() / 3 - 1); + fprintf(JDebug::stddbg, "Reliability distance = %d\n", loJDiff.getHsh()->get_reliability()); + fprintf(JDebug::stddbg, "Random accesses = %ld\n", lpFilOrg->seekcount() + lpFilNew->seekcount()); +- fprintf(JDebug::stddbg, "Delete bytes = %"PRIzd"\n", lpOut->gzOutBytDel); +- fprintf(JDebug::stddbg, "Backtrack bytes = %"PRIzd"\n", lpOut->gzOutBytBkt); +- fprintf(JDebug::stddbg, "Escape bytes written = %"PRIzd"\n", lpOut->gzOutBytEsc); +- fprintf(JDebug::stddbg, "Control bytes written = %"PRIzd"\n", lpOut->gzOutBytCtl); ++ fprintf(JDebug::stddbg, "Delete bytes = %" PRIzd "\n", lpOut->gzOutBytDel); ++ fprintf(JDebug::stddbg, "Backtrack bytes = %" PRIzd "\n", lpOut->gzOutBytBkt); ++ fprintf(JDebug::stddbg, "Escape bytes written = %" PRIzd "\n", lpOut->gzOutBytEsc); ++ fprintf(JDebug::stddbg, "Control bytes written = %" PRIzd "\n", lpOut->gzOutBytCtl); + } + if (liVerbse > 0) { +- fprintf(JDebug::stddbg, "Equal bytes = %"PRIzd"\n", lpOut->gzOutBytEql); +- fprintf(JDebug::stddbg, "Data bytes written = %"PRIzd"\n", lpOut->gzOutBytDta); +- fprintf(JDebug::stddbg, "Overhead bytes written = %"PRIzd"\n", lpOut->gzOutBytCtl + lpOut->gzOutBytEsc); ++ fprintf(JDebug::stddbg, "Equal bytes = %" PRIzd "\n", lpOut->gzOutBytEql); ++ fprintf(JDebug::stddbg, "Data bytes written = %" PRIzd "\n", lpOut->gzOutBytDta); ++ fprintf(JDebug::stddbg, "Overhead bytes written = %" PRIzd "\n", lpOut->gzOutBytCtl + lpOut->gzOutBytEsc); + } + + /* Cleanup */