diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2009-02-15 08:01:00 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2009-02-15 08:01:00 -0800 |
| commit | 0871bffae307e0553e0c5186336189e8b55cf6a6 (patch) | |
| tree | 4571d1563fe33a53a57fea1c35fb668b9d33265f /src/misc/vec/vecStr.h | |
| parent | f936cc0680c98ffe51b3a1716c996072d5dbf76c (diff) | |
| download | abc-0871bffae307e0553e0c5186336189e8b55cf6a6.tar.gz abc-0871bffae307e0553e0c5186336189e8b55cf6a6.tar.bz2 abc-0871bffae307e0553e0c5186336189e8b55cf6a6.zip | |
Version abc90215
Diffstat (limited to 'src/misc/vec/vecStr.h')
| -rw-r--r-- | src/misc/vec/vecStr.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/misc/vec/vecStr.h b/src/misc/vec/vecStr.h index a00aaa68..dc0b2bad 100644 --- a/src/misc/vec/vecStr.h +++ b/src/misc/vec/vecStr.h @@ -68,12 +68,12 @@ struct Vec_Str_t_ static inline Vec_Str_t * Vec_StrAlloc( int nCap ) { Vec_Str_t * p; - p = ALLOC( Vec_Str_t, 1 ); + p = ABC_ALLOC( Vec_Str_t, 1 ); if ( nCap > 0 && nCap < 16 ) nCap = 16; p->nSize = 0; p->nCap = nCap; - p->pArray = p->nCap? ALLOC( char, p->nCap ) : NULL; + p->pArray = p->nCap? ABC_ALLOC( char, p->nCap ) : NULL; return p; } @@ -111,7 +111,7 @@ static inline Vec_Str_t * Vec_StrStart( int nSize ) static inline Vec_Str_t * Vec_StrAllocArray( char * pArray, int nSize ) { Vec_Str_t * p; - p = ALLOC( Vec_Str_t, 1 ); + p = ABC_ALLOC( Vec_Str_t, 1 ); p->nSize = nSize; p->nCap = nSize; p->pArray = pArray; @@ -132,10 +132,10 @@ static inline Vec_Str_t * Vec_StrAllocArray( char * pArray, int nSize ) static inline Vec_Str_t * Vec_StrAllocArrayCopy( char * pArray, int nSize ) { Vec_Str_t * p; - p = ALLOC( Vec_Str_t, 1 ); + p = ABC_ALLOC( Vec_Str_t, 1 ); p->nSize = nSize; p->nCap = nSize; - p->pArray = ALLOC( char, nSize ); + p->pArray = ABC_ALLOC( char, nSize ); memcpy( p->pArray, pArray, sizeof(char) * nSize ); return p; } @@ -154,10 +154,10 @@ static inline Vec_Str_t * Vec_StrAllocArrayCopy( char * pArray, int nSize ) static inline Vec_Str_t * Vec_StrDup( Vec_Str_t * pVec ) { Vec_Str_t * p; - p = ALLOC( Vec_Str_t, 1 ); + p = ABC_ALLOC( Vec_Str_t, 1 ); p->nSize = pVec->nSize; p->nCap = pVec->nCap; - p->pArray = p->nCap? ALLOC( char, p->nCap ) : NULL; + p->pArray = p->nCap? ABC_ALLOC( char, p->nCap ) : NULL; memcpy( p->pArray, pVec->pArray, sizeof(char) * pVec->nSize ); return p; } @@ -176,7 +176,7 @@ static inline Vec_Str_t * Vec_StrDup( Vec_Str_t * pVec ) static inline Vec_Str_t * Vec_StrDupArray( Vec_Str_t * pVec ) { Vec_Str_t * p; - p = ALLOC( Vec_Str_t, 1 ); + p = ABC_ALLOC( Vec_Str_t, 1 ); p->nSize = pVec->nSize; p->nCap = pVec->nCap; p->pArray = pVec->pArray; @@ -199,8 +199,8 @@ static inline Vec_Str_t * Vec_StrDupArray( Vec_Str_t * pVec ) ***********************************************************************/ static inline void Vec_StrFree( Vec_Str_t * p ) { - FREE( p->pArray ); - FREE( p ); + ABC_FREE( p->pArray ); + ABC_FREE( p ); } /**Function************************************************************* @@ -321,7 +321,7 @@ static inline void Vec_StrGrow( Vec_Str_t * p, int nCapMin ) { if ( p->nCap >= nCapMin ) return; - p->pArray = REALLOC( char, p->pArray, 2 * nCapMin ); + p->pArray = ABC_REALLOC( char, p->pArray, 2 * nCapMin ); p->nCap = 2 * nCapMin; } |