Fix warnings related to having a 64-bit size_t.

FossilOrigin-Name: 29ac9336dba2b62d13315cecfc5c4a74cc54087a
This commit is contained in:
mistachkin 2014-07-19 15:40:39 +00:00
parent 35683976a4
commit ef60703e8f
4 changed files with 16 additions and 16 deletions

View File

@ -1,5 +1,5 @@
C Fix\swarnings\scaused\sby\sthe\sprevious\scommit.
D 2014-07-19T15:30:01.552
C Fix\swarnings\srelated\sto\shaving\sa\s64-bit\ssize_t.
D 2014-07-19T15:40:39.591
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -1160,10 +1160,10 @@ F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
F tool/pagesig.c ff0ca355fd3c2398e933da5e22439bbff89b803b
F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
F tool/showdb.c d7d354c52f259c06d84938fc2be095656e761b78
F tool/showdb.c b9ee6b6c81a094bf33badbf7e9da34cdbc0cce25
F tool/showjournal.c 053eb1cc774710c6890b7dd6293300cc297b16a5
F tool/showstat4.c c39279d6bd37cb999b634f0064f6f86ad7af008f
F tool/showwal.c 9c299ba842f1ac0364e95f9effbc3a5b3b2349f2
F tool/showwal.c 3209120269cdf9380f091459e47b776b4f81dfd3
F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe
F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b
F tool/spaceanal.tcl 8e50b217c56a6a086a1b47eac9d09c5cd65b996f
@ -1182,7 +1182,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 6dc7b2f119eb92da17c9e914bdad30a9ceaebdb5
R 7b842e4424a0effae20a64ee9f307907
P 89634a419d0c1ef899d0591c7c6ab9290bf665d2
R 7c73c160afe9efe974113734dfcd1ed9
U mistachkin
Z c9d7c6fd91ebbbad7eb3b3a8b17ddccd
Z 6a0ee89ac8bea8d9e5f887e8d36032b1

View File

@ -1 +1 @@
89634a419d0c1ef899d0591c7c6ab9290bf665d2
29ac9336dba2b62d13315cecfc5c4a74cc54087a

View File

@ -143,7 +143,7 @@ static void print_decode_line(
int val = aData[ofst];
char zBuf[100];
sprintf(zBuf, " %03x: %02x", ofst, aData[ofst]);
i = strlen(zBuf);
i = (int)strlen(zBuf);
for(j=1; j<4; j++){
if( j>=nByte ){
sprintf(&zBuf[i], " ");
@ -151,7 +151,7 @@ static void print_decode_line(
sprintf(&zBuf[i], " %02x", aData[ofst+j]);
val = val*256 + aData[ofst+j];
}
i += strlen(&zBuf[i]);
i += (int)strlen(&zBuf[i]);
}
sprintf(&zBuf[i], " %9d", val);
printf("%s %s\n", zBuf, zMsg);
@ -247,7 +247,7 @@ static i64 describeContent(
}
pData += size;
}
j = strlen(zDesc);
j = (int)strlen(zDesc);
zDesc += j;
nDesc += j;
}
@ -598,7 +598,7 @@ static void decode_btree_page(
zMap[cofst] = '[';
zMap[cofst+n-1] = ']';
sprintf(zBuf, "%d", i);
j = strlen(zBuf);
j = (int)strlen(zBuf);
if( j<=n-2 ) memcpy(&zMap[cofst+1], zBuf, j);
}
if( cellToDecode==(-2) ){

View File

@ -178,7 +178,7 @@ static void print_decode_line(
int val = aData[ofst];
char zBuf[100];
sprintf(zBuf, " %03x: %02x", ofst, aData[ofst]);
i = strlen(zBuf);
i = (int)strlen(zBuf);
for(j=1; j<4; j++){
if( j>=nByte ){
sprintf(&zBuf[i], " ");
@ -186,7 +186,7 @@ static void print_decode_line(
sprintf(&zBuf[i], " %02x", aData[ofst+j]);
val = val*256 + aData[ofst+j];
}
i += strlen(&zBuf[i]);
i += (int)strlen(&zBuf[i]);
}
if( asHex ){
sprintf(&zBuf[i], " 0x%08x", val);
@ -334,7 +334,7 @@ static i64 describeContent(
}
pData += size;
}
j = strlen(zDesc);
j = (int)strlen(zDesc);
zDesc += j;
nDesc += j;
}
@ -495,7 +495,7 @@ static void decode_btree_page(
zMap[cofst] = '[';
zMap[cofst+n-1] = ']';
sprintf(zBuf, "%d", i);
j = strlen(zBuf);
j = (int)strlen(zBuf);
if( j<=n-2 ) memcpy(&zMap[cofst+1], zBuf, j);
}
printf(" %03x: cell[%d] %s\n", cofst, i, zDesc);