vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Mar 17 03:27:26 2019 +0200| [e5b2ee14505e5cc73107ebec5a0baa998246c89e] | committer: Rémi Denis-Courmont
objects: remove always NULL destructor callback > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e5b2ee14505e5cc73107ebec5a0baa998246c89e --- src/libvlc.h | 3 --- src/misc/objects.c | 5 ----- src/misc/variables.h | 3 --- 3 files changed, 11 deletions(-) diff --git a/src/libvlc.h b/src/libvlc.h index 26d3616d8a..d950e4a88d 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -115,9 +115,6 @@ vlc_custom_create (vlc_object_t *p_this, size_t i_size, const char *psz_type); #define vlc_custom_create(o, s, n) \ vlc_custom_create(VLC_OBJECT(o), s, n) -/* Types */ -typedef void (*vlc_destructor_t) (struct vlc_object_t *); - /** * Allocates an object resource. * diff --git a/src/misc/objects.c b/src/misc/objects.c index ad5f6e261e..c5db75e2c5 100644 --- a/src/misc/objects.c +++ b/src/misc/objects.c @@ -175,7 +175,6 @@ void *vlc_custom_create (vlc_object_t *parent, size_t length, priv->var_root = NULL; vlc_mutex_init (&priv->var_lock); vlc_cond_init (&priv->var_wait); - priv->pf_destructor = NULL; priv->resources = NULL; vlc_object_t *obj = (vlc_object_t *)(priv + 1); @@ -229,10 +228,6 @@ void (vlc_object_delete)(vlc_object_t *obj) int canc = vlc_savecancel(); - /* Call the custom "subclass" destructor */ - if (priv->pf_destructor != NULL) - priv->pf_destructor(obj); - if (unlikely(priv->parent == NULL)) { /* TODO: should be in src/libvlc.c */ diff --git a/src/misc/variables.h b/src/misc/variables.h index a63ec730f2..a9f2f4dbc2 100644 --- a/src/misc/variables.h +++ b/src/misc/variables.h @@ -44,9 +44,6 @@ struct vlc_object_internals vlc_mutex_t var_lock; vlc_cond_t var_wait; - /* Objects management */ - vlc_destructor_t pf_destructor; - /* Objects tree structure */ struct vlc_list list; /**< Legacy list node */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
