From 5a079f61a4277a01e79b483711831b6b296d4651 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 7 Feb 2010 12:59:42 +0200 Subject: [PATCH] stream: remove leading underscores --- include/vlc_stream.h | 9 +++++---- src/input/stream.c | 3 ++- src/input/stream_memory.c | 5 +++-- src/libvlccore.sym | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/vlc_stream.h b/include/vlc_stream.h index 4385078226..c7d9d65603 100644 --- a/include/vlc_stream.h +++ b/include/vlc_stream.h @@ -176,15 +176,16 @@ VLC_EXPORT( void, stream_DemuxSend, ( stream_t *s, block_t *p_block ) ); * Create a stream_t reading from memory. * You must delete it using stream_Delete. */ -#define stream_MemoryNew( a, b, c, d ) __stream_MemoryNew( VLC_OBJECT(a), b, c, d ) -VLC_EXPORT( stream_t *,__stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffer, uint64_t i_size, bool b_preserve_memory ) ); +VLC_EXPORT( stream_t *, stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffer, uint64_t i_size, bool b_preserve_memory ) ); +#define stream_MemoryNew( a, b, c, d ) stream_MemoryNew( VLC_OBJECT(a), b, c, d ) /** * Create a stream_t reading from an URL. * You must delete it using stream_Delete. */ -#define stream_UrlNew( a, b ) __stream_UrlNew( VLC_OBJECT(a), b ) -VLC_EXPORT( stream_t *,__stream_UrlNew, (vlc_object_t *p_this, const char *psz_url ) ); +VLC_EXPORT( stream_t *, stream_UrlNew, (vlc_object_t *p_this, const char *psz_url ) ); +#define stream_UrlNew( a, b ) stream_UrlNew( VLC_OBJECT(a), b ) + /** * Try to add a stream filter to an open stream. diff --git a/src/input/stream.c b/src/input/stream.c index 85ac913cb1..45b3905286 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -243,10 +243,11 @@ void stream_CommonDelete( stream_t *s ) vlc_object_release( s ); } +#undef stream_UrlNew /**************************************************************************** * stream_UrlNew: create a stream from a access ****************************************************************************/ -stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) +stream_t *stream_UrlNew( vlc_object_t *p_parent, const char *psz_url ) { const char *psz_access, *psz_demux; char *psz_path; diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c index 1f4091286d..d73d846cdf 100644 --- a/src/input/stream_memory.c +++ b/src/input/stream_memory.c @@ -41,6 +41,7 @@ static int Peek ( stream_t *, const uint8_t **pp_peek, unsigned int i_read ); static int Control( stream_t *, int i_query, va_list ); static void Delete ( stream_t * ); +#undef stream_MemoryNew /** * Create a stream from a memory buffer * @@ -50,8 +51,8 @@ static void Delete ( stream_t * ); * \param i_preserve_memory if this is set to false the memory buffer * pointed to by p_buffer is freed on stream_Destroy */ -stream_t *__stream_MemoryNew( vlc_object_t *p_this, uint8_t *p_buffer, - uint64_t i_size, bool i_preserve_memory ) +stream_t *stream_MemoryNew( vlc_object_t *p_this, uint8_t *p_buffer, + uint64_t i_size, bool i_preserve_memory ) { stream_t *s = stream_CommonNew( p_this ); stream_sys_t *p_sys; diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 37002e19cc..46f256c27b 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -399,11 +399,11 @@ stream_Delete stream_DemuxNew stream_DemuxSend stream_FilterNew -__stream_MemoryNew +stream_MemoryNew stream_Peek stream_Read stream_ReadLine -__stream_UrlNew +stream_UrlNew stream_vaControl __str_format __str_format_meta -- 2.39.2