[vlc-devel] commit: bonjour: cleanings. ( Rémi Duraffort )
git version control
git at videolan.org
Tue Mar 24 21:32:16 CET 2009
vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Tue Mar 24 21:20:13 2009 +0100| [0d1293c63b18548fb66bbb49ff5fdba179af4edc] | committer: Rémi Duraffort
bonjour: cleanings.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0d1293c63b18548fb66bbb49ff5fdba179af4edc
---
modules/services_discovery/bonjour.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c
index 20f7bde..b4dfac3 100644
--- a/modules/services_discovery/bonjour.c
+++ b/modules/services_discovery/bonjour.c
@@ -1,7 +1,7 @@
/*****************************************************************************
* bonjour.c: Bonjour services discovery module
*****************************************************************************
- * Copyright (C) 2005-2008 the VideoLAN team
+ * Copyright (C) 2005-2009 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon at nanocrew.net>
@@ -31,8 +31,6 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_playlist.h>
-#include <vlc_arrays.h>
#include <vlc_services_discovery.h>
#include <avahi-client/client.h>
@@ -170,13 +168,12 @@ static void resolve_callback(
}
}
- if( psz_addr != NULL )
- free( (void *)psz_addr );
+ free( psz_addr );
if( psz_uri != NULL )
{
p_input = input_item_New( p_sd, psz_uri, name );
- free( (void *)psz_uri );
+ free( psz_uri );
}
if( p_input != NULL )
{
@@ -247,14 +244,10 @@ static int Open( vlc_object_t *p_this )
services_discovery_sys_t *p_sys;
int err;
- p_sd->p_sys = p_sys = (services_discovery_sys_t *)malloc(
- sizeof( services_discovery_sys_t ) );
-
+ p_sd->p_sys = p_sys = calloc( 1, sizeof( services_discovery_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
- memset( p_sys, 0, sizeof(*p_sys) );
-
vlc_dictionary_init( &p_sys->services_name_to_input_item, 1 );
p_sys->poll = avahi_threaded_poll_new();
More information about the vlc-devel
mailing list