[vlc-devel] commit: Write CRLF in the same I/O operation ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Sep 14 16:48:05 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Sep 14 17:49:22 2008 +0300| [143dc11a50182788fad875372ca274ffc360379e] | committer: Rémi Denis-Courmont 

Write CRLF in the same I/O operation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=143dc11a50182788fad875372ca274ffc360379e
---

 modules/control/rc.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 448ebf4..4bf38c5 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -149,18 +149,15 @@ struct intf_sys_t
 static void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
 {
     va_list args;
+    char fmt_eol[strlen (psz_fmt) + 3];
+
+    snprintf (fmt_eol, sizeof (fmt_eol), "%s\r\n", psz_fmt);
     va_start( args, psz_fmt );
 
     if( p_intf->p_sys->i_socket == -1 )
-    {
-        utf8_vfprintf( stdout, psz_fmt, args );
-        printf( "\r\n" );
-    }
+        utf8_vfprintf( stdout, fmt_eol, args );
     else
-    {
-        net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, psz_fmt, args );
-        net_Write( p_intf, p_intf->p_sys->i_socket, NULL, (uint8_t*)"\r\n", 2 );
-    }
+        net_vaPrintf( p_intf, p_intf->p_sys->i_socket, NULL, fmt_eol, args );
     va_end( args );
 }
 




More information about the vlc-devel mailing list