git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7095 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-01-05 15:09:12 +00:00
parent d6f0cec8f7
commit 592e388c40
3 changed files with 6 additions and 6 deletions

View File

@ -420,8 +420,8 @@ void sqlite3ExprAssignVarNumber(Parse *pParse, Expr *pExpr){
*/
void sqlite3ExprDelete(Expr *p){
if( p==0 ) return;
if( p->span.dyn ) sqliteFree((char*)p->span.z);
if( p->token.dyn ) sqliteFree((char*)p->token.z);
if( p->span.dyn ) sqliteFree(p->span.z);
if( p->token.dyn ) sqliteFree(p->token.z);
sqlite3ExprDelete(p->pLeft);
sqlite3ExprDelete(p->pRight);
sqlite3ExprListDelete(p->pList);
@ -478,7 +478,7 @@ Expr *sqlite3ExprDup(Expr *p){
return pNew;
}
void sqlite3TokenCopy(Token *pTo, Token *pFrom){
if( pTo->dyn ) sqliteFree((char*)pTo->z);
if( pTo->dyn ) sqliteFree(pTo->z);
if( pFrom->z ){
pTo->n = pFrom->n;
pTo->z = (u8*)sqliteStrNDup((char*)pFrom->z, pFrom->n);

View File

@ -297,7 +297,7 @@ static inline void *zmalloc(size_t x)
#endif
#define sqliteFree(x) do { free(x); x = NULL; } while(x) //sqlite3FreeX(x)
#define sqliteFree(x) do { free((void *)x); x = NULL; } while(x) //sqlite3FreeX(x)
#define sqliteAllocSize(x) sqlite3AllocSize(x)

View File

@ -21,7 +21,7 @@ void sqlite3DeleteTriggerStep(TriggerStep *pTriggerStep){
TriggerStep * pTmp = pTriggerStep;
pTriggerStep = pTriggerStep->pNext;
if( pTmp->target.dyn ) sqliteFree((char*)pTmp->target.z);
if( pTmp->target.dyn ) sqliteFree(pTmp->target.z);
sqlite3ExprDelete(pTmp->pWhere);
sqlite3ExprListDelete(pTmp->pExprList);
sqlite3SelectDelete(pTmp->pSelect);
@ -430,7 +430,7 @@ void sqlite3DeleteTrigger(Trigger *pTrigger){
sqliteFree(pTrigger->table);
sqlite3ExprDelete(pTrigger->pWhen);
sqlite3IdListDelete(pTrigger->pColumns);
if( pTrigger->nameToken.dyn ) sqliteFree((char*)pTrigger->nameToken.z);
if( pTrigger->nameToken.dyn ) sqliteFree(pTrigger->nameToken.z);
sqliteFree(pTrigger);
}