RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 10:02:17 +00:00
Code Issues Releases Wiki Activity

Slightly reduce number of #ifs

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31204 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-05-23 22:26:10 +00:00
parent bc2adc2e48
commit 8e84b9288c
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
stream/cache2.c
View File

@ -279,13 +279,25 @@ static int cache_execute_control(cache_vars_t *s) {
return 1; return 1;
} }
static void *shared_alloc(int size) {
#if FORKED_CACHE
return shmem_alloc(size);
#else
return malloc(size);
#endif
}
static void shared_free(void *ptr, int size) {
#if FORKED_CACHE
shmem_free(ptr, size);
#else
free(ptr);
#endif
}
static cache_vars_t* cache_init(int size,int sector){ static cache_vars_t* cache_init(int size,int sector){
int num; int num;
#if FORKED_CACHE cache_vars_t* s=shared_alloc(sizeof(cache_vars_t));
cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t));
#else
cache_vars_t* s=malloc(sizeof(cache_vars_t));
#endif
if(s==NULL) return NULL; if(s==NULL) return NULL;
memset(s,0,sizeof(cache_vars_t)); memset(s,0,sizeof(cache_vars_t));
@ -295,18 +307,10 @@ static cache_vars_t* cache_init(int size,int sector){
}//32kb min_size }//32kb min_size
s->buffer_size=num*sector; s->buffer_size=num*sector;
s->sector_size=sector; s->sector_size=sector;
#if FORKED_CACHE s->buffer=shared_alloc(s->buffer_size);
s->buffer=shmem_alloc(s->buffer_size);
#else
s->buffer=malloc(s->buffer_size);
#endif
if(s->buffer == NULL){ if(s->buffer == NULL){
#if FORKED_CACHE shared_free(s, sizeof(cache_vars_t));
shmem_free(s,sizeof(cache_vars_t));
#else
free(s);
#endif
return NULL; return NULL;
} }
@ -327,16 +331,10 @@ void cache_uninit(stream_t *s) {
s->cache_pid = 0; s->cache_pid = 0;
} }
if(!c) return; if(!c) return;
#if !FORKED_CACHE shared_free(c->buffer, c->buffer_size);
free(c->buffer);
c->buffer = NULL; c->buffer = NULL;
c->stream = NULL; c->stream = NULL;
free(s->cache_data); shared_free(s->cache_data, sizeof(cache_vars_t));
#else
shmem_free(c->buffer,c->buffer_size);
c->buffer = NULL;
shmem_free(s->cache_data,sizeof(cache_vars_t));
#endif
s->cache_data = NULL; s->cache_data = NULL;
} }