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

Change the VdbeOp.p4 union to include specific pointer types for the various values of VdbeOp.p4type. (CVS 4667)

Browse Source 
FossilOrigin-Name: 7e8330c8044dc7718e720dbd33f6e2fe970ead77
This commit is contained in:
danielk1977
2008-01-03 11:50:29 +00:00
parent 1f4aa337cd
commit 2dca4ac1d3
9 changed files with 119 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/vdbeapi.c
View File

@@ -293,10 +293,10 @@ static int sqlite3Step(Vdbe *p){
if( db->xTrace && !db->init.busy ){
assert( p->nOp>0 );
assert( p->aOp[p->nOp-1].opcode==OP_Noop );
assert( p->aOp[p->nOp-1].p4.p!=0 );
assert( p->aOp[p->nOp-1].p4.z!=0 );
assert( p->aOp[p->nOp-1].p4type==P4_DYNAMIC );
sqlite3SafetyOff(db);
db->xTrace(db->pTraceArg, p->aOp[p->nOp-1].p4.p);
db->xTrace(db->pTraceArg, p->aOp[p->nOp-1].p4.z);
if( sqlite3SafetyOn(db) ){
p->rc = SQLITE_MISUSE;
return SQLITE_MISUSE;
@@ -314,7 +314,7 @@ static int sqlite3Step(Vdbe *p){
*/
#ifdef SQLITE_DEBUG
if( (db->flags & SQLITE_SqlTrace)!=0 ){
sqlite3DebugPrintf("SQL-trace: %s\n", p->aOp[p->nOp-1].p4.p);
sqlite3DebugPrintf("SQL-trace: %s\n", p->aOp[p->nOp-1].p4.z);
}
#endif /* SQLITE_DEBUG */
@@ -345,9 +345,9 @@ static int sqlite3Step(Vdbe *p){
elapseTime = (rNow - (int)rNow)*3600.0*24.0*1000000000.0 - p->startTime;
assert( p->nOp>0 );
assert( p->aOp[p->nOp-1].opcode==OP_Noop );
assert( p->aOp[p->nOp-1].p4.p!=0 );
assert( p->aOp[p->nOp-1].p4.z!=0 );
assert( p->aOp[p->nOp-1].p4type==P4_DYNAMIC );
db->xProfile(db->pProfileArg, p->aOp[p->nOp-1].p4.p, elapseTime);
db->xProfile(db->pProfileArg, p->aOp[p->nOp-1].p4.z, elapseTime);
}
#endif
@@ -1001,7 +1001,7 @@ static void createVarMap(Vdbe *p){
for(j=0, pOp=p->aOp; j<p->nOp; j++, pOp++){
if( pOp->opcode==OP_Variable ){
assert( pOp->p1>0 && pOp->p1<=p->nVar );
p->azVar[pOp->p1-1] = pOp->p4.p;
p->azVar[pOp->p1-1] = pOp->p4.z;
}
}
p->okVar = 1;