Simplify the implementation of the columnName() function in vdbeapi.c.

This is a code cleanup only - no behavior changes. (CVS 6474)

FossilOrigin-Name: 0628f5864f8cc035b41bbe644bd8ec8fb43c70ce

diff --git a/manifest b/manifest
index 111da394b5ceb275f13e164871fb5e3ebd0964f7..225a076175028dc74b6fbe8bd0def30d28b46cb8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sassert()\sto\sthe\simplementation\sof\scount(*)\sthat\schecks\sthe\ncorrect\soperation\sof\sthe\ssqlite3_aggregate_count()\sfunction.\s(CVS\s6473)
-D 2009-04-08T23:04:14
+C Simplify\sthe\simplementation\sof\sthe\scolumnName()\sfunction\sin\svdbeapi.c.\nThis\sis\sa\scode\scleanup\sonly\s-\sno\sbehavior\schanges.\s(CVS\s6474)
+D 2009-04-08T23:05:29
 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 3d252f70666a80fea2fb794b6fe154a282d11573
 F src/vdbe.h d70a68bee196ab228914a3902c79dbd24342a0f2
 F src/vdbeInt.h 53a2f4696871712646c77351904576cca6ad9752
-F src/vdbeapi.c b158449a125f5e5e513ad05033dae085d7795033
+F src/vdbeapi.c adf0e8f104a831936d966888c427b70565087aed
 F src/vdbeaux.c 570aaa5e15ae141115194d22443c73c8beb5032b
 F src/vdbeblob.c e67757450ae8581a8b354d9d7e467e41502dfe38
 F src/vdbemem.c 9798905787baae83d0b53b62030e32ecf7a0586f
@@ -716,7 +716,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 3cc79162dbdbce9d08bb28942128780277101e0d
-R cad719d14d320e9183126e9bc8c80627
+P f322be3833c4a938ee7d9e4bcfd5decaca57db0b
+R e80187c69eb5fab0addc01c50974cf7a
 U drh
-Z f5295c7f28f949611e9fc538864887c4
+Z 3cf051c8edaf2e9ebf6aff384812ac24

diff --git a/manifest.uuid b/manifest.uuid
index 210c3c4dce4a65b090e0038d2cb68b0467958460..b29f92a01a55352aa39b4199ed6b50f41fb5cec7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f322be3833c4a938ee7d9e4bcfd5decaca57db0b
\ No newline at end of file
+0628f5864f8cc035b41bbe644bd8ec8fb43c70ce
\ No newline at end of file

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index bc87fde6219ee8de52e3b7430f084481aadbb8c7..87bb6da4055e029c2c554d2dd991a00548bb6897 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.157 2009/04/08 15:45:32 drh Exp $
+** $Id: vdbeapi.c,v 1.158 2009/04/08 23:05:29 drh Exp $
 */
 #include "sqliteInt.h"
 #include "vdbeInt.h"
@@ -904,23 +904,26 @@ static const void *columnName(
   const void *ret = 0;
   Vdbe *p = (Vdbe *)pStmt;
   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(p->db->mutex);
+      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( p->db && p->db->mallocFailed ){
-        p->db->mallocFailed = 0;
+      if( db->mallocFailed ){
+        db->mallocFailed = 0;
         ret = 0;
       }
-      sqlite3_mutex_leave(p->db->mutex);
+      sqlite3_mutex_leave(db->mutex);
     }
   }
   return ret;