database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +03:00
Code Activity

Fix a couple of compiler warnings.

Browse Source 
FossilOrigin-Name: 3899f3b95ed50773a72d907b39b451fefce69c9e
This commit is contained in:
drh
2011-06-15 12:43:36 +00:00
parent 376d1e5c4f
commit 1aa4f3e529
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/fts3/fts3.c
View File

@@ -3275,12 +3275,11 @@ static int fts3EvalDeferredPhrase(Fts3Cursor *pCsr, Fts3Phrase *pPhrase){
nPoslist = nList; nPoslist = nList;
}else{ }else{
assert( iPrev>=0 );
char *aOut = pList; char *aOut = pList;
char *p1 = aPoslist; char *p1 = aPoslist;
char *p2 = aOut; char *p2 = aOut;
assert( iPrev>=0 );
fts3PoslistPhraseMerge(&aOut, iToken-iPrev, 0, 1, &p1, &p2); fts3PoslistPhraseMerge(&aOut, iToken-iPrev, 0, 1, &p1, &p2);
sqlite3_free(aPoslist); sqlite3_free(aPoslist);
aPoslist = pList; aPoslist = pList;

16
manifest
View File

@@ -1,5 +1,5 @@
C Add\san\sinterface\sto\sbetter\stest\sincremental\sloading\sof\sdoclists\sby\sFTS4.\sAlso\ssome\stests\sfor\sthis\sand\sterm\sprefix\squeries. C Fix\sa\scouple\sof\scompiler\swarnings.
D 2011-06-15T08:30:29.176 D 2011-06-15T12:43:36.849
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -61,7 +61,7 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9 F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
F ext/fts3/fts3.c ae3ae91d204d177fc37a22c7bc5a3a9df70e65a0 F ext/fts3/fts3.c 6c7b588761082e3c5452fbff02c8a2004875ea26
F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
F ext/fts3/fts3Int.h a999cfbf605efec293a88519f74192f5204c84d6 F ext/fts3/fts3Int.h a999cfbf605efec293a88519f74192f5204c84d6
F ext/fts3/fts3_aux.c baed9dab7fb4604ae8cafdb2d7700abe93beffbe F ext/fts3/fts3_aux.c baed9dab7fb4604ae8cafdb2d7700abe93beffbe
@@ -135,7 +135,7 @@ F src/delete.c cecc926c70783452f3e8eb452c728291ce1a0b21
F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106 F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c 9fabba17a4d4778dc660f0cb9d781fc86d7b9d41 F src/fkey.c 9fabba17a4d4778dc660f0cb9d781fc86d7b9d41
F src/func.c d93772d9ffa51e4a8f275675bae1f61394c4ab80 F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
F src/global.c 29bfb85611dd816b04f10fba0ca910366e128d38 F src/global.c 29bfb85611dd816b04f10fba0ca910366e128d38
F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
@@ -945,7 +945,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
P 0185c4b689d18d66e6aa39b4a7bddc279e3c9d17 P 7a3813138d1a5c5d99f4756c79998831d779774f
R 1c51f9714aac7706b1e74e389e8d32c5 R e8d9fd64770806090874e1cc045d5b07
U dan U drh
Z 77f3043182a3d5e0d927f56eefb2694c Z ea6a718ef2a7cf11b3bc2eae3fdf9321

2
manifest.uuid
View File

@@ -1 +1 @@
7a3813138d1a5c5d99f4756c79998831d779774f 3899f3b95ed50773a72d907b39b451fefce69c9e

2
src/func.c
View File

@@ -608,7 +608,7 @@ static int patternCompare(
return 0; return 0;
} }
}else if( c==matchSet ){ }else if( c==matchSet ){
int prior_c = 0; u32 prior_c = 0;
assert( esc==0 ); /* This only occurs for GLOB, not LIKE */ assert( esc==0 ); /* This only occurs for GLOB, not LIKE */
seen = 0; seen = 0;
invert = 0; invert = 0;