Commit d92c4331 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

msg: simplify msg_GenericVa() macro

parent b20e1eda
...@@ -66,7 +66,8 @@ VLC_API void vlc_Log(vlc_object_t *, int, ...@@ -66,7 +66,8 @@ VLC_API void vlc_Log(vlc_object_t *, int,
const char *, const char *, ...) VLC_FORMAT( 4, 5 ); const char *, const char *, ...) VLC_FORMAT( 4, 5 );
VLC_API void vlc_vaLog(vlc_object_t *, int, VLC_API void vlc_vaLog(vlc_object_t *, int,
const char *, const char *, va_list); const char *, const char *, va_list);
#define msg_GenericVa(a, b, c, d, e) vlc_vaLog(VLC_OBJECT(a), b, c, d, e) #define msg_GenericVa(a, b, c, d) \
vlc_vaLog(VLC_OBJECT(a), b, MODULE_STRING, c, d)
#define msg_Info( p_this, ... ) \ #define msg_Info( p_this, ... ) \
vlc_Log( VLC_OBJECT(p_this), VLC_MSG_INFO, MODULE_STRING, __VA_ARGS__ ) vlc_Log( VLC_OBJECT(p_this), VLC_MSG_INFO, MODULE_STRING, __VA_ARGS__ )
......
...@@ -1471,7 +1471,7 @@ static void x264_log( void *data, int i_level, const char *psz, va_list args) ...@@ -1471,7 +1471,7 @@ static void x264_log( void *data, int i_level, const char *psz, va_list args)
i_level = VLC_MSG_DBG; i_level = VLC_MSG_DBG;
} }
msg_GenericVa( p_enc, i_level, MODULE_STRING, psz, args ); msg_GenericVa( p_enc, i_level, psz, args );
}; };
/**************************************************************************** /****************************************************************************
......
...@@ -191,7 +191,7 @@ static void MkvTree( demux_t & demuxer, int i_level, const char *psz_format, ... ...@@ -191,7 +191,7 @@ static void MkvTree( demux_t & demuxer, int i_level, const char *psz_format, ...
psz_foo2[ 4 * i_level ] = '+'; psz_foo2[ 4 * i_level ] = '+';
psz_foo2[ 4 * i_level + 1 ] = ' '; psz_foo2[ 4 * i_level + 1 ] = ' ';
strcpy( &psz_foo2[ 4 * i_level + 2 ], psz_format ); strcpy( &psz_foo2[ 4 * i_level + 2 ], psz_format );
msg_GenericVa( &demuxer,VLC_MSG_DBG, "mkv", psz_foo2, args ); msg_GenericVa( &demuxer,VLC_MSG_DBG, psz_foo2, args );
free( psz_foo2 ); free( psz_foo2 );
va_end( args ); va_end( args );
} }
......
...@@ -80,7 +80,7 @@ static inline void lua_Dbg( vlc_object_t * p_this, const char * ppz_fmt, ... ) ...@@ -80,7 +80,7 @@ static inline void lua_Dbg( vlc_object_t * p_this, const char * ppz_fmt, ... )
{ {
va_list ap; va_list ap;
va_start( ap, ppz_fmt ); va_start( ap, ppz_fmt );
msg_GenericVa( p_this, VLC_MSG_DBG, MODULE_STRING, ppz_fmt, ap ); msg_GenericVa( p_this, VLC_MSG_DBG, ppz_fmt, ap );
va_end( ap ); va_end( ap );
} }
......
...@@ -114,7 +114,7 @@ void dialog_VFatal (vlc_object_t *obj, bool modal, const char *title, ...@@ -114,7 +114,7 @@ void dialog_VFatal (vlc_object_t *obj, bool modal, const char *title,
if (provider == NULL) if (provider == NULL)
{ {
msg_Err (obj, "%s", title); msg_Err (obj, "%s", title);
msg_GenericVa (obj, VLC_MSG_ERR, MODULE_STRING, fmt, ap); msg_GenericVa (obj, VLC_MSG_ERR, fmt, ap);
return; return;
} }
......
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