system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 14:34:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

include: Simplify handling of va_list in debug printf functions.

Browse source
This commit is contained in:
Alexandre Julliard 2022-08-30 18:32:09 +02:00
parent a8b007da58
commit 4d0468e316
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/wine/debug.h
View file

@ -164,25 +164,19 @@ extern int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine
#if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT)
# define __wine_dbg_cdecl __cdecl
# define __wine_dbg_va_list __builtin_ms_va_list
# define __wine_dbg_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __wine_dbg_va_end(list) __builtin_ms_va_end(list)
#else
# define __wine_dbg_cdecl
# define __wine_dbg_va_list va_list
# define __wine_dbg_va_start(list,arg) va_start(list,arg)
# define __wine_dbg_va_end(list) va_end(list)
#endif
static const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... ) __WINE_PRINTF_ATTR(1,2);
static inline const char * __wine_dbg_cdecl wine_dbg_sprintf( const char *format, ... )
{
char buffer[200];
__wine_dbg_va_list args;
va_list args;
__wine_dbg_va_start( args, format );
va_start( args, format );
vsnprintf( buffer, sizeof(buffer), format, args );
__wine_dbg_va_end( args );
va_end( args );
return __wine_dbg_strdup( buffer );
}
@ -190,11 +184,11 @@ static int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... ) __WINE_PR
static inline int __wine_dbg_cdecl wine_dbg_printf( const char *format, ... )
{
char buffer[1024];
__wine_dbg_va_list args;
va_list args;
__wine_dbg_va_start( args, format );
va_start( args, format );
vsnprintf( buffer, sizeof(buffer), format, args );
__wine_dbg_va_end( args );
va_end( args );
return __wine_dbg_output( buffer );
}
@ -206,7 +200,7 @@ static inline int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls,
const char *function, const char *format, ... )
{
char buffer[1024];
__wine_dbg_va_list args;
va_list args;
int ret;
if (*format == '\1') /* special magic to avoid standard prefix */
@ -216,9 +210,9 @@ static inline int __wine_dbg_cdecl wine_dbg_log( enum __wine_debug_class cls,
}
if ((ret = __wine_dbg_header( cls, channel, function )) == -1) return ret;
__wine_dbg_va_start( args, format );
va_start( args, format );
vsnprintf( buffer, sizeof(buffer), format, args );
__wine_dbg_va_end( args );
va_end( args );
ret += __wine_dbg_output( buffer );
return ret;
}