From: dan Date: Fri, 27 Nov 2009 12:14:47 +0000 (+0000) Subject: Remove a C++ism accidentally added to fts3.c. X-Git-Tag: version-3.7.2~788 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6d7b055fa686b17f97d0e5f80ad8682808c7ada;p=thirdparty%2Fsqlite.git Remove a C++ism accidentally added to fts3.c. FossilOrigin-Name: 97d332416069d2fbce323740b276d0e7523eeee5 --- diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index 9974b5cb62..483db5ae07 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -1546,8 +1546,9 @@ static int fts3TermSelect( assert( (rc==SQLITE_OK)==(pNew!=0) ); if( pNew ){ if( nSegment==nAlloc ){ + Fts3SegReader **pArray; nAlloc += 16; - Fts3SegReader **pArray = (Fts3SegReader **)sqlite3_realloc( + pArray = (Fts3SegReader **)sqlite3_realloc( apSegment, nAlloc*sizeof(Fts3SegReader *) ); if( !pArray ){ diff --git a/manifest b/manifest index 22191b85d1..b6fe0f41f5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Move\s[7d30880114]\sto\sthe\strunk.\sAdd\soptimizations\sto\sreduce\sthe\snumber\sof\sopcodes\sused\sfor\sBEFORE\sUPDATE\striggers. -D 2009-11-27T12:12:34 +C Remove\sa\sC++ism\saccidentally\sadded\sto\sfts3.c. +D 2009-11-27T12:14:47 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -56,7 +56,7 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c 6396a59d3fbe8e2ef0b6afe5d5a1f575943f3d22 +F ext/fts3/fts3.c c2776bb39a5cd97d8a96fcfd86f9ad17d3120606 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe F ext/fts3/fts3Int.h 74b21db1c4479c220e803ecf45a78de3b5ac9480 F ext/fts3/fts3_expr.c bdf11f3602f62f36f0e42823680bf22033dae0de @@ -774,7 +774,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P cb4b928648504ce29d751834e9ee3b5278dfca65 -R 38ca3dab21e3d85a61a2ba8f76e8fc34 +P 1b7c5250ccb63182324bfc3f1ea28f17b6db357a +R 4f3e4d7bdaea2deab6ca1cc8b6afd005 U dan -Z 0eaf554ff6bd1729f2cb11e15acc51b6 +Z 8fc0c0d7a169063cf2a99fa0caefb002 diff --git a/manifest.uuid b/manifest.uuid index 152bb9b6cd..7421b4cdee 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1b7c5250ccb63182324bfc3f1ea28f17b6db357a \ No newline at end of file +97d332416069d2fbce323740b276d0e7523eeee5 \ No newline at end of file