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 compiler warnings.

Browse Source 
FossilOrigin-Name: 5c31ee62a196b914673384a611534fd778dc64b0
This commit is contained in:
drh
2015-09-19 18:08:13 +00:00
parent 3f81f10804
commit 8faee877cb
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
manifest
View File

@@ -1,5 +1,5 @@
C Add\sjson1.c\sto\sthe\sfuzzer\stest\sshells. C Fix\scompiler\swarnings.
D 2015-09-19T16:51:58.703 D 2015-09-19T18:08:13.197
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2047811644c5bac91ccdfc2720e49b60965a63a7 F Makefile.in 2047811644c5bac91ccdfc2720e49b60965a63a7
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -332,7 +332,7 @@ F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2
F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7 F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9 F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
F src/pcache1.c a0c0bb29f7bd720743a16a95eb5dedba3ade15bc F src/pcache1.c e822007159d53a7ea7aa040d6e28964ddb6de083
F src/pragma.c d71b813e67bf03f3116b9dd5164fbfd81ec673a2 F src/pragma.c d71b813e67bf03f3116b9dd5164fbfd81ec673a2
F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1 F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
@@ -406,7 +406,7 @@ F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
F src/vdbe.c 5048103aa6bc9c01bf1a4620729256d1e873bb6c F src/vdbe.c 5048103aa6bc9c01bf1a4620729256d1e873bb6c
F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
F src/vdbeapi.c 0d890f57caf143b114a95ce699e59af51359c508 F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649 F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915 F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
@@ -419,7 +419,7 @@ F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
F src/where.c 882fb44b36201fafc32dd7d59366f852806b7e70 F src/where.c 882fb44b36201fafc32dd7d59366f852806b7e70
F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647 F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
F src/wherecode.c 5b534714feb301628f7123c1c424689501746811 F src/wherecode.c 7660e1ad16817a921b099af553f3e1349352d16f
F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@ -1387,8 +1387,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 650605a820f3860b1d6e955cdda23aaff01dfdb5 91682ac39e7db6a5dc8b75695a757449f068184a P 809d67b61164b83bbb6962f0edee1793a483ccab
R 60742f729d8d1b5355e0fe1beff285a6 R bab8c56b96d20ed3c77321003b4b9a52
T +closed 91682ac39e7db6a5dc8b75695a757449f068184a
U drh U drh
Z 24e2ef08db7fcb908a9735efd5bb2f32 Z 6a9fa43b557b8b4a775a8ba25a8484d8

2
manifest.uuid
View File

@@ -1 +1 @@
809d67b61164b83bbb6962f0edee1793a483ccab 5c31ee62a196b914673384a611534fd778dc64b0

4
src/pcache1.c
View File

@@ -413,7 +413,7 @@ static PgHdr1 *pcache1AllocPage(PCache1 *pCache, int benignMalloc){
assert( pCache->pGroup==&pcache1.grp ); assert( pCache->pGroup==&pcache1.grp );
pcache1LeaveMutex(pCache->pGroup); pcache1LeaveMutex(pCache->pGroup);
#endif #endif
if( benignMalloc ) sqlite3BeginBenignMalloc(); if( benignMalloc ){ sqlite3BeginBenignMalloc(); }
#ifdef SQLITE_PCACHE_SEPARATE_HEADER #ifdef SQLITE_PCACHE_SEPARATE_HEADER
pPg = pcache1Alloc(pCache->szPage); pPg = pcache1Alloc(pCache->szPage);
p = sqlite3Malloc(sizeof(PgHdr1) + pCache->szExtra); p = sqlite3Malloc(sizeof(PgHdr1) + pCache->szExtra);
@@ -426,7 +426,7 @@ static PgHdr1 *pcache1AllocPage(PCache1 *pCache, int benignMalloc){
pPg = pcache1Alloc(pCache->szAlloc); pPg = pcache1Alloc(pCache->szAlloc);
p = (PgHdr1 *)&((u8 *)pPg)[pCache->szPage]; p = (PgHdr1 *)&((u8 *)pPg)[pCache->szPage];
#endif #endif
if( benignMalloc ) sqlite3EndBenignMalloc(); if( benignMalloc ){ sqlite3EndBenignMalloc(); }
#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
pcache1EnterMutex(pCache->pGroup); pcache1EnterMutex(pCache->pGroup);
#endif #endif

23
src/vdbeapi.c
View File

@@ -912,18 +912,19 @@ static const Mem *columnNullValue(void){
#endif #endif
= { = {
/* .u = */ {0}, /* .u = */ {0},
/* .flags = */ MEM_Null, /* .flags = */ (u16)MEM_Null,
/* .enc = */ 0, /* .enc = */ (u8)0,
/* .n = */ 0, /* .eSubtype = */ (u8)0,
/* .z = */ 0, /* .n = */ (int)0,
/* .zMalloc = */ 0, /* .z = */ (char*)0,
/* .szMalloc = */ 0, /* .zMalloc = */ (char*)0,
/* .iPadding1 = */ 0, /* .szMalloc = */ (int)0,
/* .db = */ 0, /* .uTemp = */ (u32)0,
/* .xDel = */ 0, /* .db = */ (sqlite3*)0,
/* .xDel = */ (void(*)(void*))0,
#ifdef SQLITE_DEBUG #ifdef SQLITE_DEBUG
/* .pScopyFrom = */ 0, /* .pScopyFrom = */ (Mem*)0,
/* .pFiller = */ 0, /* .pFiller = */ (void*)0,
#endif #endif
}; };
return &nullMem; return &nullMem;

4
src/wherecode.c
View File

@@ -65,7 +65,7 @@ static const char *explainIndexColumnName(Index *pIdx, int i){
** **
** "a=? AND b>?" ** "a=? AND b>?"
*/ */
static void explainIndexRange(StrAccum *pStr, WhereLoop *pLoop, Table *pTab){ static void explainIndexRange(StrAccum *pStr, WhereLoop *pLoop){
Index *pIndex = pLoop->u.btree.pIndex; Index *pIndex = pLoop->u.btree.pIndex;
u16 nEq = pLoop->u.btree.nEq; u16 nEq = pLoop->u.btree.nEq;
u16 nSkip = pLoop->nSkip; u16 nSkip = pLoop->nSkip;
@@ -166,7 +166,7 @@ int sqlite3WhereExplainOneScan(
if( zFmt ){ if( zFmt ){
sqlite3StrAccumAppend(&str, " USING ", 7); sqlite3StrAccumAppend(&str, " USING ", 7);
sqlite3XPrintf(&str, 0, zFmt, pIdx->zName); sqlite3XPrintf(&str, 0, zFmt, pIdx->zName);
explainIndexRange(&str, pLoop, pItem->pTab); explainIndexRange(&str, pLoop);
} }
}else if( (flags & WHERE_IPK)!=0 && (flags & WHERE_CONSTRAINT)!=0 ){ }else if( (flags & WHERE_IPK)!=0 && (flags & WHERE_CONSTRAINT)!=0 ){
const char *zRangeOp; const char *zRangeOp;