vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jul 22 23:41:01 2015 +0300| [3389292c67ff8704839b68b6388e21f5a50f72a6] | committer: Rémi Denis-Courmont
access: merge access_Delete() and vlc_access_Delete() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3389292c67ff8704839b68b6388e21f5a50f72a6 --- src/input/access.c | 23 +++++++---------------- src/input/access.h | 1 - src/input/stream.c | 4 ++-- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/input/access.c b/src/input/access.c index e21e282..a3174ca 100644 --- a/src/input/access.c +++ b/src/input/access.c @@ -105,21 +105,6 @@ error: return NULL; } -/***************************************************************************** - * access_Delete: - *****************************************************************************/ -void access_Delete( access_t *p_access ) -{ - module_unneed( p_access, p_access->p_module ); - - free( p_access->psz_access ); - free( p_access->psz_location ); - free( p_access->psz_filepath ); - free( p_access->psz_demux ); - - vlc_object_release( p_access ); -} - access_t *vlc_access_NewMRL(vlc_object_t *parent, const char *mrl) { char *buf = strdup(mrl); @@ -138,7 +123,13 @@ access_t *vlc_access_NewMRL(vlc_object_t *parent, const char *mrl) void vlc_access_Delete(access_t *access) { - access_Delete(access); + module_unneed(access, access->p_module); + + free(access->psz_access); + free(access->psz_location); + free(access->psz_filepath); + free(access->psz_demux); + vlc_object_release(access); } /***************************************************************************** diff --git a/src/input/access.h b/src/input/access.h index d16d27b..fe37716 100644 --- a/src/input/access.h +++ b/src/input/access.h @@ -32,7 +32,6 @@ access_t *access_New( vlc_object_t *p_obj, input_thread_t *p_input, const char *psz_access, const char *psz_demux, const char *psz_path ); #define access_New( a, b, c, d, e ) access_New(VLC_OBJECT(a), b, c, d, e ) -void access_Delete( access_t * ); char *get_path(const char *location); diff --git a/src/input/stream.c b/src/input/stream.c index db38a18..6fd1f8a 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -385,7 +385,7 @@ error: } free( s->p_sys ); stream_CommonDelete( s ); - access_Delete( p_access ); + vlc_access_Delete( p_access ); return NULL; } @@ -404,7 +404,7 @@ static void AStreamDestroy( stream_t *s ) free( p_sys->p_peek ); stream_CommonDelete( s ); - access_Delete( p_sys->p_access ); + vlc_access_Delete( p_sys->p_access ); free( p_sys ); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
