database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Change prototype for busy callbacks to "int xBusy(void *, int);" (CVS 1573)

Browse Source 
FossilOrigin-Name: 4f1cfca5ca703d0068cf8d6222dc8e0cfb7e24b6
This commit is contained in:
danielk1977
2004-06-12 01:43:26 +00:00
parent dc8453fd7a
commit 2a764eb0cd
10 changed files with 49 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/vdbe.c
View File

@@ -43,7 +43,7 @@
** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code.
**
** $Id: vdbe.c,v 1.366 2004/06/12 00:42:35 danielk1977 Exp $
** $Id: vdbe.c,v 1.367 2004/06/12 01:43:27 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -2378,16 +2378,12 @@ case OP_Transaction: {
}
rc = sqlite3BtreeBeginTrans(pBt, pOp->p2, db->nMaster);
if( rc==SQLITE_BUSY ){
if( db->busyHandler.xFunc==0 ){
p->pc = pc;
p->rc = SQLITE_BUSY;
p->pTos = pTos;
return SQLITE_BUSY;
}else{
sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(rc), (char*)0);
}
p->pc = pc;
p->rc = SQLITE_BUSY;
p->pTos = pTos;
return SQLITE_BUSY;
}
if( rc!=SQLITE_OK && rc!=SQLITE_READONLY && rc!=SQLITE_BUSY ){
if( rc!=SQLITE_OK && rc!=SQLITE_READONLY /* && rc!=SQLITE_BUSY */ ){
goto abort_due_to_error;
}
}
@@ -2565,15 +2561,10 @@ case OP_OpenWrite: {
}
switch( rc ){
case SQLITE_BUSY: {
if( db->busyHandler.xFunc ){
p->pc = pc;
p->rc = SQLITE_BUSY;
p->pTos = &pTos[1 + (pOp->p2<=0)]; /* Operands must remain on stack */
return SQLITE_BUSY;
}else{
sqlite3SetString(&p->zErrMsg, sqlite3ErrStr(rc), (char*)0);
}
break;
p->pc = pc;
p->rc = SQLITE_BUSY;
p->pTos = &pTos[1 + (pOp->p2<=0)]; /* Operands must remain on stack */
return SQLITE_BUSY;
}
case SQLITE_OK: {
int flags = sqlite3BtreeFlags(pCur->pCursor);