Commit 0ed6e06d authored by Rafaël Carré's avatar Rafaël Carré

file access: rename callbacks

avoid having extern Open() symbol defined multiple times in static builds
parent a4c19fb2
...@@ -129,9 +129,9 @@ static bool IsRemote (int fd) ...@@ -129,9 +129,9 @@ static bool IsRemote (int fd)
#endif #endif
/***************************************************************************** /*****************************************************************************
* Open: open the file * FileOpen: open the file
*****************************************************************************/ *****************************************************************************/
int Open( vlc_object_t *p_this ) int FileOpen( vlc_object_t *p_this )
{ {
access_t *p_access = (access_t*)p_this; access_t *p_access = (access_t*)p_this;
#ifdef WIN32 #ifdef WIN32
...@@ -242,9 +242,9 @@ error: ...@@ -242,9 +242,9 @@ error:
} }
/***************************************************************************** /*****************************************************************************
* Close: close the target * FileClose: close the target
*****************************************************************************/ *****************************************************************************/
void Close (vlc_object_t * p_this) void FileClose (vlc_object_t * p_this)
{ {
access_t *p_access = (access_t*)p_this; access_t *p_access = (access_t*)p_this;
......
...@@ -56,7 +56,7 @@ vlc_module_begin () ...@@ -56,7 +56,7 @@ vlc_module_begin ()
add_obsolete_string( "file-cat" ) add_obsolete_string( "file-cat" )
set_capability( "access", 50 ) set_capability( "access", 50 )
add_shortcut( "file", "fd", "stream" ) add_shortcut( "file", "fd", "stream" )
set_callbacks( Open, Close ) set_callbacks( FileOpen, FileClose )
add_submodule() add_submodule()
set_section( N_("Directory" ), NULL ) set_section( N_("Directory" ), NULL )
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include <dirent.h> #include <dirent.h>
int Open (vlc_object_t *); int FileOpen (vlc_object_t *);
void Close (vlc_object_t *); void FileClose (vlc_object_t *);
int NoSeek (access_t *, uint64_t); int NoSeek (access_t *, uint64_t);
ssize_t FileRead (access_t *, uint8_t *, size_t); ssize_t FileRead (access_t *, uint8_t *, size_t);
......
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