[vlc-commits] telx: use vlc_obj_calloc() and simplify

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Sep 25 16:41:44 2020 +0300| [74d6edf31fcf1bbe4985ac75fbcca436693b7bd8] | committer: Rémi Denis-Courmont

telx: use vlc_obj_calloc() and simplify

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=74d6edf31fcf1bbe4985ac75fbcca436693b7bd8
---

 modules/codec/telx.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/modules/codec/telx.c b/modules/codec/telx.c
index dc5259f4e2..8563aab4db 100644
--- a/modules/codec/telx.c
+++ b/modules/codec/telx.c
@@ -47,7 +47,6 @@
  * Module descriptor.
  *****************************************************************************/
 static int  Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
 static int  Decode( decoder_t *, block_t * );
 
 #define OVERRIDE_PAGE_TEXT N_("Override page")
@@ -72,7 +71,7 @@ vlc_module_begin ()
     set_capability( "spu decoder", 50 )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_SCODEC )
-    set_callbacks( Open, Close )
+    set_callback( Open )
 
     add_integer( "telx-override-page", -1,
                  OVERRIDE_PAGE_TEXT, OVERRIDE_PAGE_LONGTEXT, true )
@@ -185,14 +184,13 @@ static int Open( vlc_object_t *p_this )
     decoder_sys_t *p_sys = NULL;
     int            i_val;
 
-
     if( p_dec->fmt_in.i_codec != VLC_CODEC_TELETEXT)
     {
         return VLC_EGENERIC;
     }
 
     p_dec->pf_decode = Decode;
-    p_sys = p_dec->p_sys = calloc( 1, sizeof(*p_sys) );
+    p_sys = p_dec->p_sys = vlc_obj_calloc( p_this, 1, sizeof(*p_sys) );
     if( p_sys == NULL )
         return VLC_ENOMEM;
     p_dec->fmt_out.i_codec = 0;
@@ -249,17 +247,6 @@ static int Open( vlc_object_t *p_this )
 /*     return VLC_EGENERIC; */
 }
 
-/*****************************************************************************
- * Close:
- *****************************************************************************/
-static void Close( vlc_object_t *p_this )
-{
-    decoder_t     *p_dec = (decoder_t*) p_this;
-    decoder_sys_t *p_sys = p_dec->p_sys;
-
-    free( p_sys );
-}
-
 /**************************
  * change bits endianness *
  **************************/