kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 09:36:46 +00:00
Code Issues Projects Releases Wiki Activity

BSD fixes, thanks jontow for the use of your box

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7105 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2008-01-06 01:10:37 +00:00
parent b5b7bf1362
commit ab9efea581
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/sqlite/src/sqliteInt.h
View File

@@ -281,20 +281,26 @@ static inline void *zmalloc(size_t x)
return z;
}
static inline char *strndup_lite(const char *s, size_t n)
{
char *dup = malloc(n+1);
assert(dup);
memcpy(dup, s, n);
*(dup+n) = '\0';
return dup;
}
#define ENTER_MALLOC 0
#define sqliteMalloc(x) zmalloc(x)//sqlite3Malloc(x,1)
#define sqliteMallocRaw(x) malloc(x)//sqlite3MallocRaw(x,1)
#define sqliteRealloc(x,y) realloc(x, y)//sqlite3Realloc(x,y)
#define sqliteStrDup(x) strdup(x)//sqlite3StrDup(x)
#define sqliteStrNDup(x,y) sqlite3StrNDup(x,y)
#define sqliteStrNDup(x,y) strndup_lite(x,y) //sqlite3StrNDup(x,y)
#define sqliteReallocOrFree(x,y) sqlite3ReallocOrFree(x,y)
#endif
#define sqliteFree(x) if (x) { free((void *)x); x = NULL; } //sqlite3FreeX(x)
#define sqliteFree(x) if (x) { free((void *)x); x = NULL;} //sqlite3FreeX(x)
#define sqliteAllocSize(x) sqlite3AllocSize(x)

2
libs/sqlite/src/util.c
View File

@@ -729,7 +729,7 @@ char *sqlite3StrDup(const char *z){
char *sqlite3StrNDup(const char *z, int n){
char *zNew;
if( z==0 ) return 0;
zNew = sqliteMallocRaw(n+1);
zNew = sqlite3MallocRaw(n+1, 1);
if( zNew ){
memcpy(zNew, z, n);
zNew[n] = 0;

2
libs/sqlite/src/vdbefifo.c
View File

@@ -89,7 +89,7 @@ int sqlite3VdbeFifoPop(Fifo *pFifo, i64 *pVal){
pFifo->pFirst = pPage->pNext;
sqliteFree(pPage);
if( pFifo->nEntry==0 ){
assert( pFifo->pLast==pPage );
//assert( pFifo->pLast==pPage );
pFifo->pLast = 0;
}else{
assert( pFifo->pFirst!=0 );