vlc | branch: master | Thomas Guillem <[email protected]> | Mon Jan 21 14:20:04 2019 +0100| [b72f28f0599d341aea43c427364b252732320f83] | committer: Thomas Guillem
microdns: remove an unnecessary layer of struct > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b72f28f0599d341aea43c427364b252732320f83 --- modules/services_discovery/microdns.c | 51 ++++++++++++----------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/modules/services_discovery/microdns.c b/modules/services_discovery/microdns.c index ea95c7ff48..db86e41ac9 100644 --- a/modules/services_discovery/microdns.c +++ b/modules/services_discovery/microdns.c @@ -97,16 +97,6 @@ struct discovery_sys vlc_array_t items; }; -typedef struct -{ - struct discovery_sys s; -} services_discovery_sys_t; - -struct vlc_renderer_discovery_sys -{ - struct discovery_sys s; -}; - struct item { char * psz_uri; @@ -391,8 +381,7 @@ static void new_entries_sd_cb( void *p_this, int i_status, const struct rr_entry *p_entries ) { services_discovery_t *p_sd = (services_discovery_t *)p_this; - services_discovery_sys_t *p_sdsys = p_sd->p_sys; - struct discovery_sys *p_sys = &p_sdsys->s; + struct discovery_sys *p_sys = p_sd->p_sys; if( i_status < 0 ) { print_error( VLC_OBJECT( p_sd ), "entry callback", i_status ); @@ -435,8 +424,7 @@ static bool stop_sd_cb( void *p_this ) { services_discovery_t *p_sd = ( services_discovery_t* )p_this; - services_discovery_sys_t *p_sdsys = p_sd->p_sys; - struct discovery_sys *p_sys = &p_sdsys->s; + struct discovery_sys *p_sys = p_sd->p_sys; if( atomic_load( &p_sys->stop ) ) return true; @@ -451,8 +439,7 @@ static void * RunSD( void *p_this ) { services_discovery_t *p_sd = ( services_discovery_t* )p_this; - services_discovery_sys_t *p_sdsys = p_sd->p_sys; - struct discovery_sys *p_sys = &p_sdsys->s; + struct discovery_sys *p_sys = p_sd->p_sys; int i_status = mdns_listen( p_sys->p_microdns, p_sys->ppsz_service_names, @@ -470,8 +457,7 @@ static void new_entries_rd_cb( void *p_this, int i_status, const struct rr_entry *p_entries ) { vlc_renderer_discovery_t *p_rd = (vlc_renderer_discovery_t *)p_this; - struct vlc_renderer_discovery_sys *p_rd_sys = p_rd->p_sys; - struct discovery_sys *p_sys = &p_rd_sys->s; + struct discovery_sys *p_sys = p_rd->p_sys; if( i_status < 0 ) { print_error( VLC_OBJECT( p_rd ), "entry callback", i_status ); @@ -550,8 +536,7 @@ static bool stop_rd_cb( void *p_this ) { vlc_renderer_discovery_t *p_rd = p_this; - struct vlc_renderer_discovery_sys *p_rd_sys = p_rd->p_sys; - struct discovery_sys *p_sys = &p_rd_sys->s; + struct discovery_sys *p_sys = p_rd->p_sys; if( atomic_load( &p_sys->stop ) ) return true; @@ -566,8 +551,7 @@ static void * RunRD( void *p_this ) { vlc_renderer_discovery_t *p_rd = p_this; - struct vlc_renderer_discovery_sys *p_rd_sys = p_rd->p_sys; - struct discovery_sys *p_sys = &p_rd_sys->s; + struct discovery_sys *p_sys = p_rd->p_sys; int i_status = mdns_listen( p_sys->p_microdns, p_sys->ppsz_service_names, @@ -636,6 +620,7 @@ CleanCommon( struct discovery_sys *p_sys ) items_clear( p_sys ); mdns_destroy( p_sys->p_microdns ); + free( p_sys ); } static int @@ -643,7 +628,7 @@ OpenSD( vlc_object_t *p_obj ) { services_discovery_t *p_sd = (services_discovery_t *)p_obj; - services_discovery_sys_t *p_sys = calloc( 1, sizeof(services_discovery_sys_t) ); + struct discovery_sys *p_sys = calloc( 1, sizeof(struct discovery_sys) ); if( !p_sys ) return VLC_ENOMEM; p_sd->p_sys = p_sys; @@ -651,17 +636,16 @@ OpenSD( vlc_object_t *p_obj ) p_sd->description = _("mDNS Network Discovery"); config_ChainParse( p_sd, CFG_PREFIX, ppsz_options, p_sd->p_cfg ); - return OpenCommon( p_obj, &p_sys->s, false ); + return OpenCommon( p_obj, p_sys, false ); } static void CloseSD( vlc_object_t *p_this ) { services_discovery_t *p_sd = (services_discovery_t *) p_this; - services_discovery_sys_t *p_sys = p_sd->p_sys; + struct discovery_sys *p_sys = p_sd->p_sys; - CleanCommon( &p_sys->s ); - free( p_sys ); + CleanCommon( p_sys ); } static int @@ -669,22 +653,21 @@ OpenRD( vlc_object_t *p_obj ) { vlc_renderer_discovery_t *p_rd = (vlc_renderer_discovery_t *)p_obj; - struct vlc_renderer_discovery_sys *p_rd_sys = p_rd->p_sys = - calloc( 1, sizeof(struct vlc_renderer_discovery_sys) ); - if( !p_rd->p_sys ) + struct discovery_sys *p_sys = calloc( 1, sizeof(struct discovery_sys) ); + if( !p_sys ) return VLC_ENOMEM; + p_rd->p_sys = p_sys; config_ChainParse( p_rd, CFG_PREFIX, ppsz_options, p_rd->p_cfg ); - return OpenCommon( p_obj, &p_rd_sys->s, true ); + return OpenCommon( p_obj, p_sys, true ); } static void CloseRD( vlc_object_t *p_this ) { vlc_renderer_discovery_t *p_rd = (vlc_renderer_discovery_t *) p_this; - struct vlc_renderer_discovery_sys *p_rd_sys = p_rd->p_sys; + struct discovery_sys *p_sys = p_rd->p_sys; - CleanCommon( &p_rd_sys->s ); - free( p_rd->p_sys ); + CleanCommon( p_sys ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
