Author: anthm Date: Sat Jan 5 10:09:12 2008 New Revision: 7095 Modified: freeswitch/trunk/libs/sqlite/src/expr.c freeswitch/trunk/libs/sqlite/src/sqliteInt.h freeswitch/trunk/libs/sqlite/src/trigger.c Log: update Modified: freeswitch/trunk/libs/sqlite/src/expr.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/expr.c (original) +++ freeswitch/trunk/libs/sqlite/src/expr.c Sat Jan 5 10:09:12 2008 @@ -420,8 +420,8 @@ */ 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 @@ 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); Modified: freeswitch/trunk/libs/sqlite/src/sqliteInt.h ============================================================================== --- freeswitch/trunk/libs/sqlite/src/sqliteInt.h (original) +++ freeswitch/trunk/libs/sqlite/src/sqliteInt.h Sat Jan 5 10:09:12 2008 @@ -297,7 +297,7 @@ #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) Modified: freeswitch/trunk/libs/sqlite/src/trigger.c ============================================================================== --- freeswitch/trunk/libs/sqlite/src/trigger.c (original) +++ freeswitch/trunk/libs/sqlite/src/trigger.c Sat Jan 5 10:09:12 2008 @@ -21,7 +21,7 @@ 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 @@ 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); }