Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix warnings caused by the previous commit. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | toolWarnings |
| Files: | files | file ages | folders |
| SHA1: |
89634a419d0c1ef899d0591c7c6ab929 |
| User & Date: | mistachkin 2014-07-19 15:30:01 |
Context
|
2014-07-19
| ||
| 15:40 | Fix warnings related to having a 64-bit size_t. (check-in: 29ac9336 user: mistachkin tags: toolWarnings) | |
| 15:30 | Fix warnings caused by the previous commit. (check-in: 89634a41 user: mistachkin tags: toolWarnings) | |
|
2014-07-18
| ||
| 21:16 | Fix harmless compiler warnings for MSVC in the showdb/showwal command line tools. (check-in: 6dc7b2f1 user: mistachkin tags: toolWarnings) | |
Changes
Changes to tool/showdb.c.
237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 ... 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 ... 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 |
}else if( x==8 ){
sprintf(zDesc, "0");
}else if( x==9 ){
sprintf(zDesc, "1");
}else if( x>=12 ){
i64 size = (x-12)/2;
if( (x&1)==0 ){
sprintf(zDesc, "blob(%d)", size);
}else{
sprintf(zDesc, "txt(%d)", size);
}
pData += size;
}
j = strlen(zDesc);
zDesc += j;
nDesc += j;
}
................................................................................
x += 4;
}
if( cType!=5 ){
i = decodeVarint(x, &nPayload);
printBytes(a, x, i);
nLocal = localPayload(nPayload, cType);
if( nLocal==nPayload ){
printf("payload-size: %d\n", (int)nPayload);
}else{
printf("payload-size: %d (%d local, %d overflow)\n",
(int)nPayload, nLocal, (int)(nPayload-nLocal));
}
x += i;
}else{
nPayload = nLocal = 0;
}
end = x + nLocal;
if( cType==5 || cType==13 ){
................................................................................
printf("%s\n", zConst);
}
j = ofstCol[i] + szCol[i];
}
}
if( j<nLocal ){
printBytes(a, x+j, 0);
printf("... %d bytes of content ...\n", nLocal-j);
}
if( nLocal<nPayload ){
printBytes(a, x+nLocal, 4);
printf("overflow-page: %d\n", decodeInt32(x+nLocal));
}
}
|
| | | | | | |
237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 ... 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 ... 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 |
}else if( x==8 ){
sprintf(zDesc, "0");
}else if( x==9 ){
sprintf(zDesc, "1");
}else if( x>=12 ){
i64 size = (x-12)/2;
if( (x&1)==0 ){
sprintf(zDesc, "blob(%lld)", size);
}else{
sprintf(zDesc, "txt(%lld)", size);
}
pData += size;
}
j = strlen(zDesc);
zDesc += j;
nDesc += j;
}
................................................................................
x += 4;
}
if( cType!=5 ){
i = decodeVarint(x, &nPayload);
printBytes(a, x, i);
nLocal = localPayload(nPayload, cType);
if( nLocal==nPayload ){
printf("payload-size: %lld\n", nPayload);
}else{
printf("payload-size: %lld (%lld local, %lld overflow)\n",
nPayload, nLocal, nPayload-nLocal);
}
x += i;
}else{
nPayload = nLocal = 0;
}
end = x + nLocal;
if( cType==5 || cType==13 ){
................................................................................
printf("%s\n", zConst);
}
j = ofstCol[i] + szCol[i];
}
}
if( j<nLocal ){
printBytes(a, x+j, 0);
printf("... %lld bytes of content ...\n", nLocal-j);
}
if( nLocal<nPayload ){
printBytes(a, x+nLocal, 4);
printf("overflow-page: %d\n", decodeInt32(x+nLocal));
}
}
|
Changes to tool/showwal.c.
324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 |
}else if( x==8 ){
sprintf(zDesc, "0");
}else if( x==9 ){
sprintf(zDesc, "1");
}else if( x>=12 ){
i64 size = (x-12)/2;
if( (x&1)==0 ){
sprintf(zDesc, "blob(%d)", size);
}else{
sprintf(zDesc, "txt(%d)", size);
}
pData += size;
}
j = strlen(zDesc);
zDesc += j;
nDesc += j;
}
|
| | |
324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 |
}else if( x==8 ){
sprintf(zDesc, "0");
}else if( x==9 ){
sprintf(zDesc, "1");
}else if( x>=12 ){
i64 size = (x-12)/2;
if( (x&1)==0 ){
sprintf(zDesc, "blob(%lld)", size);
}else{
sprintf(zDesc, "txt(%lld)", size);
}
pData += size;
}
j = strlen(zDesc);
zDesc += j;
nDesc += j;
}
|