vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat May 9 19:07:52 2015 +0300| [9b629ed21d06e5be3a4ca869b781048cda917803] | committer: Rémi Denis-Courmont
Remove no longer used net_vaPrintf() argument > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b629ed21d06e5be3a4ca869b781048cda917803 --- include/vlc_network.h | 4 ++-- modules/control/oldrc.c | 2 +- src/network/io.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vlc_network.h b/include/vlc_network.h index 80939ea..1c69b21 100644 --- a/include/vlc_network.h +++ b/include/vlc_network.h @@ -153,8 +153,8 @@ VLC_API char * net_Gets( vlc_object_t *p_this, int fd ); VLC_API ssize_t net_Printf( vlc_object_t *p_this, int fd, const char *psz_fmt, ... ) VLC_FORMAT( 3, 4 ); #define net_Printf(o,fd,...) net_Printf(VLC_OBJECT(o),fd, __VA_ARGS__) -VLC_API ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *, const char *psz_fmt, va_list args ); -#define net_vaPrintf(a,b,c,d,e) net_vaPrintf(VLC_OBJECT(a),b,c,d,e) +VLC_API ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const char *psz_fmt, va_list args ); +#define net_vaPrintf(a,b,c,d) net_vaPrintf(VLC_OBJECT(a),b,c,d) #ifdef _WIN32 /* Microsoft: same semantic, same value, different name... go figure */ diff --git a/modules/control/oldrc.c b/modules/control/oldrc.c index 00d7667..a455e75 100644 --- a/modules/control/oldrc.c +++ b/modules/control/oldrc.c @@ -149,7 +149,7 @@ static void msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... ) if( p_intf->p_sys->i_socket == -1 ) utf8_vfprintf( stdout, fmt_eol, args ); else - net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, fmt_eol, args ); + net_vaPrintf( p_intf, p_intf->p_sys->i_socket, fmt_eol, args ); va_end( args ); } #define msg_rc( ... ) msg_rc( p_intf, __VA_ARGS__ ) diff --git a/src/network/io.c b/src/network/io.c index 438e194..b576c62 100644 --- a/src/network/io.c +++ b/src/network/io.c @@ -510,14 +510,14 @@ ssize_t net_Printf( vlc_object_t *p_this, int fd, const char *psz_fmt, ... ) int i_ret; va_list args; va_start( args, psz_fmt ); - i_ret = net_vaPrintf( p_this, fd, NULL, psz_fmt, args ); + i_ret = net_vaPrintf( p_this, fd, psz_fmt, args ); va_end( args ); return i_ret; } #undef net_vaPrintf -ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, +ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const char *psz_fmt, va_list args ) { char *psz; @@ -526,7 +526,7 @@ ssize_t net_vaPrintf( vlc_object_t *p_this, int fd, const v_socket_t *p_vs, int i_size = vasprintf( &psz, psz_fmt, args ); if( i_size == -1 ) return -1; - i_ret = net_Write( p_this, fd, p_vs, psz, i_size ) < i_size + i_ret = net_Write( p_this, fd, NULL, psz, i_size ) < i_size ? -1 : i_size; free( psz ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
