/ Check-in [436314b5]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Suppress a compiler warning that was appearing with SQLITE_THREADSAFE=0.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 436314b5728c9413f9ac2d837e1c19364f31be72
User & Date: drh 2015-03-24 18:19:39
Context
2015-03-24
21:34
Fix a couple comment typos in a tool script. No changes to code. check-in: 83421af6 user: mistachkin tags: trunk
21:27
Add SQLITE_STDCALL and SQLITE_CDECL macros on public function definitions. check-in: 242f09d4 user: mistachkin tags: stdcall
19:43
Update this branch with latest trunk changes. check-in: 3ccd64ef user: dan tags: insert-select-opt
19:02
Merge all recent trunk enhancements into the sessions branch. check-in: 54aaa6f2 user: drh tags: sessions
18:49
Merge the latest trunk enhancements into the apple-osx branch. check-in: a2bd81e5 user: drh tags: apple-osx
18:19
Suppress a compiler warning that was appearing with SQLITE_THREADSAFE=0. check-in: 436314b5 user: drh tags: trunk
16:43
Prevent a virtual table from being destroyed while it is in use. Also: replace Vdbe.inVtabMethod with sqlite3.nVDestroy. Simplify the EXPLAIN output for P4.pVtab to only show the sqlite3_vtab pointer. check-in: cbeb9a1a user: drh tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/status.c.

144
145
146
147
148
149
150

151
152
153
154
155
156
157
  sqlite3_mutex_enter(pMutex);
  *pCurrent = wsdStat.nowValue[op];
  *pHighwater = wsdStat.mxValue[op];
  if( resetFlag ){
    wsdStat.mxValue[op] = wsdStat.nowValue[op];
  }
  sqlite3_mutex_leave(pMutex);

  return SQLITE_OK;
}
int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag){
  sqlite3_int64 iCur, iHwtr;
  int rc;
#ifdef SQLITE_ENABLE_API_ARMOR
  if( pCurrent==0 || pHighwater==0 ) return SQLITE_MISUSE_BKPT;







>







144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
  sqlite3_mutex_enter(pMutex);
  *pCurrent = wsdStat.nowValue[op];
  *pHighwater = wsdStat.mxValue[op];
  if( resetFlag ){
    wsdStat.mxValue[op] = wsdStat.nowValue[op];
  }
  sqlite3_mutex_leave(pMutex);
  (void)pMutex;  /* Prevent warning when SQLITE_THREADSAFE=0 */
  return SQLITE_OK;
}
int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag){
  sqlite3_int64 iCur, iHwtr;
  int rc;
#ifdef SQLITE_ENABLE_API_ARMOR
  if( pCurrent==0 || pHighwater==0 ) return SQLITE_MISUSE_BKPT;