summaryrefslogtreecommitdiffstats
path: root/m_config.c
diff options
context:
space:
mode:
authorreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-02 08:17:07 +0000
committerreynaldo <reynaldo@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-02 08:17:07 +0000
commit3afd65b3afd338a32af0df8c8f0fdd4d2649c74e (patch)
tree8ee5d6fc8ccb7bc3f69d49a496f434a27af3c1e5 /m_config.c
parent9d9a15d18572d1450fd8fef495be3629bf85c995 (diff)
downloadmpv-3afd65b3afd338a32af0df8c8f0fdd4d2649c74e.tar.bz2
mpv-3afd65b3afd338a32af0df8c8f0fdd4d2649c74e.tar.xz
rm unnecesary casts from void* - part 3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18884 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'm_config.c')
-rw-r--r--m_config.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/m_config.c b/m_config.c
index a9db1e6b6c..f8dcf46b44 100644
--- a/m_config.c
+++ b/m_config.c
@@ -47,7 +47,7 @@ m_config_new(void) {
};
int i;
- config = (m_config_t*)calloc(1,sizeof(m_config_t));
+ config = calloc(1,sizeof(m_config_t));
config->lvl = 1; // 0 Is the defaults
if(!inited) {
inited = 1;
@@ -133,7 +133,7 @@ m_config_push(m_config_t* config) {
m_option_save(co->opt,co->slots->data,co->opt->p);
// Allocate a new slot
- slot = (m_config_save_slot_t*)calloc(1,sizeof(m_config_save_slot_t) + co->opt->type->size);
+ slot = calloc(1,sizeof(m_config_save_slot_t) + co->opt->type->size);
slot->lvl = config->lvl;
slot->prev = co->slots;
co->slots = slot;
@@ -193,7 +193,7 @@ m_config_add_option(m_config_t *config, m_option_t *arg, char* prefix) {
#endif
// Allocate a new entry for this option
- co = (m_config_option_t*)calloc(1,sizeof(m_config_option_t) + arg->type->size);
+ co = calloc(1,sizeof(m_config_option_t) + arg->type->size);
co->opt = arg;
// Fill in the full name
@@ -225,7 +225,7 @@ m_config_add_option(m_config_t *config, m_option_t *arg, char* prefix) {
}
if(!(co->flags & M_CFG_OPT_ALIAS)) {
// Allocate a slot for the defaults
- sl = (m_config_save_slot_t*)calloc(1,sizeof(m_config_save_slot_t) + arg->type->size);
+ sl = calloc(1,sizeof(m_config_save_slot_t) + arg->type->size);
m_option_save(arg,sl->data,(void**)arg->p);
// Hack to avoid too much trouble with dynamicly allocated data :
// We always use a dynamic version
@@ -235,7 +235,7 @@ m_config_add_option(m_config_t *config, m_option_t *arg, char* prefix) {
}
sl->lvl = 0;
sl->prev = NULL;
- co->slots = (m_config_save_slot_t*)calloc(1,sizeof(m_config_save_slot_t) + arg->type->size);
+ co->slots = calloc(1,sizeof(m_config_save_slot_t) + arg->type->size);
co->slots->prev = sl;
co->slots->lvl = config->lvl;
m_option_copy(co->opt,co->slots->data,sl->data);