database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00
Code Activity

Fix a couple of harmless compiler warnings.

Browse Source 
FossilOrigin-Name: fcf480cc630976b619aabd5f7fb7b09601a178fb
This commit is contained in:
drh
2014-03-03 21:46:55 +00:00
parent 9b8afef260
commit 13a747e5e4
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@@ -1,5 +1,5 @@
C Avoid\sa\sbuffer\soverread\sin\svdbeCompareRecordInt()\sthat\smight\soccur\sif\sthe\sdatabase\sis\scorrupt. C Fix\sa\scouple\sof\sharmless\scompiler\swarnings.
D 2014-03-03T20:48:50.982 D 2014-03-03T21:46:55.799
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
F src/btree.c d288e668614449571ec269535dc4aaf216a23db2 F src/btree.c 7a81c2c6b5c0bf6334b4247e709c639c573fbcc1
F src/btree.h 9e0f97c01b972f779eb7655cfb4f8727fd6dc26f F src/btree.h 9e0f97c01b972f779eb7655cfb4f8727fd6dc26f
F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4 F src/btreeInt.h 0be66063468a520e4d66b80c7a1dc26d04ee6ea4
F src/build.c 00ce613bc2256e525c9195cb10d0df7bcc48d1f0 F src/build.c 00ce613bc2256e525c9195cb10d0df7bcc48d1f0
@@ -281,7 +281,7 @@ F src/vdbe.c 75c3f5d27ab79af214646cf37d7551bc8cec09c2
F src/vdbe.h d189f92468a17a6f04daeec9df3b767f50557b21 F src/vdbe.h d189f92468a17a6f04daeec9df3b767f50557b21
F src/vdbeInt.h 9ccca0bc7646c918d065943e44bead4bf5de213d F src/vdbeInt.h 9ccca0bc7646c918d065943e44bead4bf5de213d
F src/vdbeapi.c 5bc41aaea448a7fc250902c418f1795859be3820 F src/vdbeapi.c 5bc41aaea448a7fc250902c418f1795859be3820
F src/vdbeaux.c 687165bd405b33553c9aaf5da74c249cea083d24 F src/vdbeaux.c 5adf67ef9cdaa57b393c0a8bf0a29eadbd6f9158
F src/vdbeblob.c d939997de046b8fcc607cfee4248f3d33dbcca50 F src/vdbeblob.c d939997de046b8fcc607cfee4248f3d33dbcca50
F src/vdbemem.c 2d7918e4c80546d943414668b1485b2581f58a28 F src/vdbemem.c 2d7918e4c80546d943414668b1485b2581f58a28
F src/vdbesort.c 46801acb342e5e4c07ba1777fe58880c143abb59 F src/vdbesort.c 46801acb342e5e4c07ba1777fe58880c143abb59
@@ -1154,7 +1154,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
P 1f4991ab1676bf85599fc32068ceeddeb05f648c P 7c0b4381f0e6f33cb13299a915851d9431bf3850
R 112194c4c042293d2f5fc41663c08a7a R 4042a62ac4c0618104f381105ba13add
U dan U drh
Z e0c8dc8360525071b6a4931f6b50a318 Z 0037dd9417989b6d6f935caf436e0a2a

2
manifest.uuid
View File

@@ -1 +1 @@
7c0b4381f0e6f33cb13299a915851d9431bf3850 fcf480cc630976b619aabd5f7fb7b09601a178fb

2
src/btree.c
View File

@@ -4575,6 +4575,8 @@ int sqlite3BtreeMovetoUnpacked(
|| pIdxKey->default_rc==0 || pIdxKey->default_rc==0
|| pIdxKey->default_rc==-1 || pIdxKey->default_rc==-1
); );
}else{
xRecordCompare = 0; /* Not actually used. Avoids a compiler warning. */
} }
rc = moveToRoot(pCur); rc = moveToRoot(pCur);

1
src/vdbeaux.c
View File

@@ -3575,7 +3575,6 @@ static int vdbeRecordCompareInt(
const UnpackedRecord *pPKey2, /* Right key */ const UnpackedRecord *pPKey2, /* Right key */
int bSkip /* Ignored */ int bSkip /* Ignored */
){ ){
int szHdr = *(const u8*)pKey1;
const u8 *aKey = &((const u8*)pKey1)[*(const u8*)pKey1 & 0x3F]; const u8 *aKey = &((const u8*)pKey1)[*(const u8*)pKey1 & 0x3F];
int serial_type = ((const u8*)pKey1)[1]; int serial_type = ((const u8*)pKey1)[1];
int res; int res;