[vlc-commits] sap: prepare for void *p_sys

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec  3 17:05:50 2017 +0200| [769b4e8971c277c865b67e0c3be5d51e1efa9c3c] | committer: Rémi Denis-Courmont

sap: prepare for void *p_sys

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

 modules/services_discovery/sap.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 0f28dbf1b5..3bcdeae3bb 100644
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -391,10 +391,11 @@ static int OpenDemux( vlc_object_t *p_this )
         goto error;
     if( p_sdp->psz_uri == NULL ) goto error;
 
-    p_demux->p_sys = (demux_sys_t *)malloc( sizeof(demux_sys_t) );
-    if( unlikely( !p_demux->p_sys ) )
+    demux_sys_t *p_sys = malloc( sizeof(*p_sys) );
+    if( unlikely(p_sys == NULL) )
         goto error;
-    p_demux->p_sys->p_sdp = p_sdp;
+    p_sys->p_sdp = p_sdp;
+    p_demux->p_sys = p_sys;
     p_demux->pf_control = Control;
     p_demux->pf_demux = Demux;
 
@@ -440,10 +441,11 @@ static void Close( vlc_object_t *p_this )
 static void CloseDemux( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
+    demux_sys_t *sys = p_demux->p_sys;
 
-    if( p_demux->p_sys->p_sdp )
-        FreeSDP( p_demux->p_sys->p_sdp );
-    free( p_demux->p_sys );
+    if( sys->p_sdp )
+        FreeSDP( sys->p_sdp );
+    free( sys );
 }
 
 /*****************************************************************************
@@ -611,7 +613,8 @@ static void *Run( void *data )
  **********************************************************************/
 static int Demux( demux_t *p_demux )
 {
-    sdp_t *p_sdp = p_demux->p_sys->p_sdp;
+    demux_sys_t *p_sys = p_demux->p_sys;
+    sdp_t *p_sdp = p_sys->p_sdp;
     input_thread_t *p_input = p_demux->p_input;
     input_item_t *p_parent_input;