Commit 3389292c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

access: merge access_Delete() and vlc_access_Delete()

parent 3a7fdd03
......@@ -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);
}
/*****************************************************************************
......
......@@ -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);
......
......@@ -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 );
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment