]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Remove an unreachable condition. Replace it with an assert().
authordrh <drh@noemail.net>
Mon, 3 Dec 2012 19:42:39 +0000 (19:42 +0000)
committerdrh <drh@noemail.net>
Mon, 3 Dec 2012 19:42:39 +0000 (19:42 +0000)
FossilOrigin-Name: 7d5fc1a339cf4f3597ab6a5f3e7101884d2d7673

manifest
manifest.uuid
src/insert.c

index ec3b113d3463160ad12d4474f71571cf2e8c8468..60900d200cb29e34e7c1bf1cb9a6ebcc6589b767 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthat\sthe\soptimization\sthat\sset\sthe\smaximum\scolumn\sthat\swill\sbe\sused\non\sa\sparticular\squery\sdoes\snot\smistakenly\schange\san\sopcode\sother\sthan\nOP_OpenRead\sor\sOP_OpenWrite.\s\sIn\sparticular,\smake\ssure\sit\sdoes\snot\soverwrite\nthe\sP4\sfield\sof\san\sOP_SorterOpen.
-D 2012-12-03T17:04:40.994
+C Remove\san\sunreachable\scondition.\s\sReplace\sit\swith\san\sassert().
+D 2012-12-03T19:42:39.167
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -138,7 +138,7 @@ F src/global.c e59ecd2c553ad0d4bfbc84ca71231336f8993a7a
 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4
 F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
-F src/insert.c ad0d8943d2a4f0b52ebf75b9e459f2da00117dbd
+F src/insert.c d7ed04b1fab887d6d26cf5e36753f5d6d1246290
 F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
@@ -1025,7 +1025,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 2e5e65152758bc37439584ccba4c1b1c5ceb24f8
-R a8b889710169aeb4c03f1d5fd7d8d5f6
+P b0c1ba655d69c0c46c16ea2aef4e6c9a3e6ce3fb
+R b849c716d2b2c058f619a22bc4f40fe8
 U drh
-Z 49f89035377b6df810239244d05c5340
+Z 0f893cca86d4c59ca9756d8f8e113fff
index ad9fa804ecc48521423262952aa0be5d3632cfde..fd0b82143f8b23661e5a6ce6e61db9e6ff31f8e2 100644 (file)
@@ -1 +1 @@
-b0c1ba655d69c0c46c16ea2aef4e6c9a3e6ce3fb
\ No newline at end of file
+7d5fc1a339cf4f3597ab6a5f3e7101884d2d7673
\ No newline at end of file
index 47a2b104edfab046af863d113d6fcfda2e40880e..d7425d4fe8a4f98dd0c9542c0b8148f445353a14 100644 (file)
@@ -25,7 +25,7 @@ void sqlite3OpenTable(
   int opcode      /* OP_OpenRead or OP_OpenWrite */
 ){
   Vdbe *v;
-  if( IsVirtual(pTab) ) return;
+  assert( !IsVirtual(pTab) );
   v = sqlite3GetVdbe(p);
   assert( opcode==OP_OpenWrite || opcode==OP_OpenRead );
   sqlite3TableLock(p, iDb, pTab->tnum, (opcode==OP_OpenWrite)?1:0, pTab->zName);