Remove unused branches from the vdbeapi.c module. (CVS 6489)

FossilOrigin-Name: 7ae0fc7ea55dc5b5fbeef20f476a00f619bd3c5c

diff --git a/manifest b/manifest
index 84c9b3c350ac08c59ce6f0a8c0442077fd152944..2af3200ca907c2f1cb20be7ddab18b2a77b8f516 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\serror\stolerance\swhen\sverifying\sthe\sapproximate\ssize\sof\sa\spseudo-random\sdatabase\sin\sbackup_ioerr.test.\sOtherwise\sthe\stest\scould\sfail\sdepending\son\sthe\sPRNG\sseed.\s(CVS\s6488)
-D 2009-04-10T18:41:01
+C Remove\sunused\sbranches\sfrom\sthe\svdbeapi.c\smodule.\s(CVS\s6489)
+D 2009-04-10T20:32:00
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -203,7 +203,7 @@ F src/vacuum.c 07121a727beeee88f27d704a00313ad6a7c9bef0
 F src/vdbe.c 88bc70921ccdcff8bfdf574f3e2285d17ab97103
 F src/vdbe.h 35a648bc3279a120da24f34d9a25213ec15daf8a
 F src/vdbeInt.h df5c5a1c739c98af2c83440dde3fc361240f3a25
-F src/vdbeapi.c d3c6f28dbf462187f3fd696f2357e0d23940abac
+F src/vdbeapi.c 6cb5f22a7c79bc454cd88a53a33cb2f0b7467d46
 F src/vdbeaux.c 5ecb4c7a041b8926a8927b1a27bcbb8ff74ae5c4
 F src/vdbeblob.c e67757450ae8581a8b354d9d7e467e41502dfe38
 F src/vdbemem.c 9798905787baae83d0b53b62030e32ecf7a0586f
@@ -717,7 +717,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 493f03bd73a15de994f69f23e9df8bb3ee4d20dc
-R 9edeb6e31420e3ec6ea70937ba904948
-U danielk1977
-Z b2ba47a1084766334184ad298146c828
+P deda5ab35e7663ba5f30c08b16ef3393d7146816
+R 7e5bddc43bc0a6227f5bedc4dc56ef95
+U drh
+Z ba13437a497941ce455ccaf2f065555f

diff --git a/manifest.uuid b/manifest.uuid
index 0caa426fc5f7c8e6640334398d5b4900060a4b82..44c62e7643d9e6808bd07a900a636671200c19ee 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-deda5ab35e7663ba5f30c08b16ef3393d7146816
\ No newline at end of file
+7ae0fc7ea55dc5b5fbeef20f476a00f619bd3c5c
\ No newline at end of file

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 3a20b3efe438db11cd6f219427396db26dcd42fb..7ffd2ee2274c478c4d091327ce27205808f5f161 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -13,7 +13,7 @@
 ** This file contains code use to implement APIs that are part of the
 ** VDBE.
 **
-** $Id: vdbeapi.c,v 1.159 2009/04/09 14:02:44 drh Exp $
+** $Id: vdbeapi.c,v 1.160 2009/04/10 20:32:00 drh Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -764,7 +764,7 @@ static Mem *columnMem(sqlite3_stmt *pStmt, int i){
   }else{
     /* ((double)0) In case of SQLITE_OMIT_FLOATING_POINT... */
     static const Mem nullMem = {{0}, (double)0, 0, "", 0, MEM_Null, SQLITE_NULL, 0, 0, 0 };
-    if( pVm && pVm->db ){
+    if( pVm && ALWAYS(pVm->db) ){
       sqlite3_mutex_enter(pVm->db->mutex);
       sqlite3Error(pVm->db, SQLITE_RANGE, 0);
     }
@@ -906,25 +906,21 @@ static const void *columnName(
   int n;
   sqlite3 *db = p->db;
   
-
-  if( p!=0 ){
-    assert( db!=0 );
-    n = sqlite3_column_count(pStmt);
-    if( N<n && N>=0 ){
-      N += useType*n;
-      sqlite3_mutex_enter(db->mutex);
-      assert( db->mallocFailed==0 );
-      ret = xFunc(&p->aColName[N]);
-
-      /* A malloc may have failed inside of the xFunc() call. If this
-      ** is the case, clear the mallocFailed flag and return NULL.
-      */
-      if( db->mallocFailed ){
-        db->mallocFailed = 0;
-        ret = 0;
-      }
-      sqlite3_mutex_leave(db->mutex);
+  assert( db!=0 );
+  n = sqlite3_column_count(pStmt);
+  if( N<n && N>=0 ){
+    N += useType*n;
+    sqlite3_mutex_enter(db->mutex);
+    assert( db->mallocFailed==0 );
+    ret = xFunc(&p->aColName[N]);
+     /* A malloc may have failed inside of the xFunc() call. If this
+    ** is the case, clear the mallocFailed flag and return NULL.
+    */
+    if( db->mallocFailed ){
+      db->mallocFailed = 0;
+      ret = 0;
     }
+    sqlite3_mutex_leave(db->mutex);
   }
   return ret;
 }