Skip to content

V
vlc-gpu
Commit 4dac6348 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

vlc_arrays: remove unused macro _ARRAY_GROW 

don't start variables with _, they have local scope anyway
parent b1239508
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 32 deletions
include/vlc_arrays.h
View file @ 4dac6348
...@@ -110,30 +110,27 @@ static inline void *realloc_down( void *ptr, size_t size ) ...@@ -110,30 +110,27 @@ static inline void *realloc_down( void *ptr, size_t size )
#define TAB_FIND( count, tab, p, index ) \ #define TAB_FIND( count, tab, p, index ) \
do { \ do { \
int _i_; \ (index) = -1; \
(index) = -1; \ for( int i = 0; i < (count); i++ ) \
for( _i_ = 0; _i_ < (count); _i_++ ) \ if( (tab)[i] == (p) ) \
{ \ { \
if( (tab)[_i_] == (p) ) \ (index) = i; \
{ \ break; \
(index) = _i_; \
break; \
} \
} \ } \
} while(0) } while(0)
#define TAB_REMOVE( count, tab, p ) \ #define TAB_REMOVE( count, tab, p ) \
do { \ do { \
int _i_index_; \ int i_index; \
TAB_FIND( count, tab, p, _i_index_ ); \ TAB_FIND( count, tab, p, i_index ); \
if( _i_index_ >= 0 ) \ if( i_index >= 0 ) \
{ \ { \
if( (count) > 1 ) \ if( (count) > 1 ) \
{ \ { \
memmove( ((void**)(tab) + _i_index_), \ memmove( ((void**)(tab) + i_index), \
((void**)(tab) + _i_index_+1), \ ((void**)(tab) + i_index+1), \
( (count) - _i_index_ - 1 ) * sizeof( void* ) );\ ( (count) - i_index - 1 ) * sizeof( void* ) );\
} \ } \
(count)--; \ (count)--; \
if( (count) == 0 ) \ if( (count) == 0 ) \
...@@ -208,24 +205,6 @@ static inline void *realloc_down( void *ptr, size_t size ) ...@@ -208,24 +205,6 @@ static inline void *realloc_down( void *ptr, size_t size )
_ARRAY_ALLOC(array, (int)(array.i_alloc * 1.5) ) \ _ARRAY_ALLOC(array, (int)(array.i_alloc * 1.5) ) \
} }
#define _ARRAY_GROW(array,additional) { \
int i_first = (array).i_alloc; \
while( (array).i_alloc - i_first < additional ) \
{ \
if( (array).i_alloc < 10 ) \
_ARRAY_ALLOC(array, 10 ) \
else if( (array).i_alloc == (array).i_size ) \
_ARRAY_ALLOC(array, (int)((array).i_alloc * 1.5) ) \
else break; \
} \
}
#define _ARRAY_SHRINK(array) { \
if( (array).i_size > 10 && (array).i_size < (int)((array).i_alloc / 1.5) ) { \
_ARRAY_ALLOC(array, (array).i_size + 5); \
} \
}
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
/* API */ /* API */
...@@ -269,6 +248,12 @@ static inline void *realloc_down( void *ptr, size_t size ) ...@@ -269,6 +248,12 @@ static inline void *realloc_down( void *ptr, size_t size )
(array).i_size++; \ (array).i_size++; \
} while(0) } while(0)
#define _ARRAY_SHRINK(array) { \
if( (array).i_size > 10 && (array).i_size < (int)((array).i_alloc / 1.5) ) { \
_ARRAY_ALLOC(array, (array).i_size + 5); \
} \
}
#define ARRAY_REMOVE(array,pos) \ #define ARRAY_REMOVE(array,pos) \
do { \ do { \
if( (array).i_size - (pos) - 1 ) \ if( (array).i_size - (pos) - 1 ) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment