From 143dc11a50182788fad875372ca274ffc360379e Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 14 Sep 2008 17:49:22 +0300 Subject: [PATCH] Write CRLF in the same I/O operation --- modules/control/rc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/modules/control/rc.c b/modules/control/rc.c index 448ebf46ff..4bf38c5ecc 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 ); } -- 2.39.2