commit e501b89adad9fef84008c30c5bb663fb9c59f79a
author danielk1977 <danielk1977@noemail.net> Mon Jan 09 06:29:47 2006 +0000
committer danielk1977 <danielk1977@noemail.net> Mon Jan 09 06:29:47 2006 +0000
tree 4cd5547b8b856c2d3e0871c57bce138e72ff6b27
parent 2e94d4dea54ad6c1b1539468ee517b363049bd2c

Rename DbSchema to "Schema" and SqliteTsd to "ThreadData". (CVS 2893)

FossilOrigin-Name: 82b81f69c78cb3f54634d9aea4f6a838474dc5e5

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 2846017..6c78582 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.244 2006/01/05 11:34:34 danielk1977 Exp $
+** $Id: expr.c,v 1.245 2006/01/09 06:29:48 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -263,7 +263,7 @@
 void sqlite3ExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){
   assert( pRight!=0 );
   assert( pLeft!=0 );
-  if( !sqlite3Tsd()->mallocFailed && pRight->z && pLeft->z ){
+  if( !sqlite3ThreadData()->mallocFailed && pRight->z && pLeft->z ){
     assert( pLeft->dyn==0 || pLeft->z[pLeft->n]==0 );
     if( pLeft->dyn==0 && pRight->dyn==0 ){
       pExpr->span.z = pLeft->z;
@@ -358,7 +358,7 @@
         sqlite3ReallocOrFree((void**)&pParse->apVarExpr,
                        pParse->nVarExprAlloc*sizeof(pParse->apVarExpr[0]) );
       }
-      if( !sqlite3Tsd()->mallocFailed ){
+      if( !sqlite3ThreadData()->mallocFailed ){
         assert( pParse->apVarExpr!=0 );
         pParse->apVarExpr[pParse->nVarExpr++] = pExpr;
       }
@@ -462,7 +462,7 @@
       sqlite3TokenCopy(&pNewExpr->span, &pOldExpr->span);
     }
     assert( pNewExpr==0 || pNewExpr->span.z!=0 
-            || pOldExpr->span.z==0 || sqlite3Tsd()->mallocFailed );
+            || pOldExpr->span.z==0 || sqlite3ThreadData()->mallocFailed );
     pItem->zName = sqliteStrDup(pOldItem->zName);
     pItem->sortOrder = pOldItem->sortOrder;
     pItem->isAgg = pOldItem->isAgg;
@@ -831,7 +831,7 @@
   zDb = sqlite3NameFromToken(pDbToken);
   zTab = sqlite3NameFromToken(pTableToken);
   zCol = sqlite3NameFromToken(pColumnToken);
-  if( sqlite3Tsd()->mallocFailed ){
+  if( sqlite3ThreadData()->mallocFailed ){
     goto lookupname_end;
   }
 
@@ -1306,7 +1306,7 @@
     int mem = pParse->nMem++;
     sqlite3VdbeAddOp(v, OP_MemLoad, mem, 0);
     testAddr = sqlite3VdbeAddOp(v, OP_If, 0, 0);
-    assert( testAddr>0 || sqlite3Tsd()->mallocFailed );
+    assert( testAddr>0 || sqlite3ThreadData()->mallocFailed );
     sqlite3VdbeAddOp(v, OP_MemInt, 1, mem);
   }