[vlc-commits] avahi: remove useless avahi_threaded_poll_stop() from error path

Petri Hintukainen git at videolan.org
Thu Mar 10 09:57:10 CET 2016


vlc | branch: master | Petri Hintukainen <phintuka at gmail.com> | Tue Mar  1 10:36:09 2016 +0200| [42568e38a5e85a8763126d1579a36f9f3df15c42] | committer: Petri Hintukainen

avahi: remove useless avahi_threaded_poll_stop() from error path

Error path is never triggered after avahi_threaded_poll_start().
Even if it was, thread should probably be stopped before freeing avahi client ...

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

 modules/services_discovery/avahi.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/services_discovery/avahi.c b/modules/services_discovery/avahi.c
index 8265ef6..73145c4 100644
--- a/modules/services_discovery/avahi.c
+++ b/modules/services_discovery/avahi.c
@@ -314,10 +314,7 @@ error:
     if( p_sys->client != NULL )
         avahi_client_free( p_sys->client );
     if( p_sys->poll != NULL )
-    {
-        avahi_threaded_poll_stop( p_sys->poll );
         avahi_threaded_poll_free( p_sys->poll );
-    }
 
     vlc_dictionary_clear( &p_sys->services_name_to_input_item, NULL, NULL );
     free( p_sys );



More information about the vlc-commits mailing list