commit 7e8b848a60a305231cca0b8cfc7f08be5f0429bd
author drh <drh@noemail.net> Wed Jan 23 03:03:05 2008 +0000
committer drh <drh@noemail.net> Wed Jan 23 03:03:05 2008 +0000
tree b413adb49b7ddd4166e6a878068fd15e1a25273e
parent 4b2f9368cbbc9a26e8dcbcb87791267c10d14f50

Make sqlite3SafetyOn() and sqlite3SafetyOff() macros which disappear when
compiling without -DSQLITE_DEBUG=1. (CVS 4744)

FossilOrigin-Name: 5375ad6b4b652f388469b0ce4e8e78b3f49169bd

src/where.c

diff --git a/src/where.c b/src/where.c
index 1ad296e..ae8fb4b 100644
--- a/src/where.c
+++ b/src/where.c
@@ -16,7 +16,7 @@
 ** so is applicable.  Because this module is responsible for selecting
 ** indices, you might also think of this module as the "query optimizer".
 **
-** $Id: where.c,v 1.284 2008/01/19 20:11:26 drh Exp $
+** $Id: where.c,v 1.285 2008/01/23 03:03:05 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1381,7 +1381,7 @@
     *(int*)&pIdxInfo->nOrderBy = 0;
   }
 
-  sqlite3SafetyOff(pParse->db);
+  (void)sqlite3SafetyOff(pParse->db);
   WHERETRACE(("xBestIndex for %s\n", pTab->zName));
   TRACE_IDX_INPUTS(pIdxInfo);
   rc = pTab->pVtab->pModule->xBestIndex(pTab->pVtab, pIdxInfo);
@@ -1392,10 +1392,8 @@
     }else {
       sqlite3ErrorMsg(pParse, "%s", sqlite3ErrStr(rc));
     }
-    sqlite3SafetyOn(pParse->db);
-  }else{
-    rc = sqlite3SafetyOn(pParse->db);
   }
+  (void)sqlite3SafetyOn(pParse->db);
   *(int*)&pIdxInfo->nOrderBy = nOrderBy;
 
   return pIdxInfo->estimatedCost;