Alexandre Julliard : libwine: Make the debug functions obsolete.
Alexandre Julliard
julliard at winehq.org
Wed Jan 29 16:24:06 CST 2020
Module: wine
Branch: master
Commit: c1dadbcfb1776b9ed33dcbf849d6c0aa43ab9913
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1dadbcfb1776b9ed33dcbf849d6c0aa43ab9913
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jan 29 10:49:04 2020 +0100
libwine: Make the debug functions obsolete.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/wine/debug.c | 52 +++++++++++++++++++++++++++-------------------------
libs/wine/wine.map | 16 ++++++++--------
2 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/libs/wine/debug.c b/libs/wine/debug.c
index 0e710223a2..f2b03b76e8 100644
--- a/libs/wine/debug.c
+++ b/libs/wine/debug.c
@@ -20,6 +20,9 @@
#include "config.h"
#include "wine/port.h"
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
#include <stdlib.h>
#include <stdio.h>
@@ -30,12 +33,6 @@
# include <sys/stat.h>
#endif
-#define __wine_dbg_get_channel_flags __wine_dbg_get_channel_flags_inline
-#define wine_dbg_sprintf wine_dbg_sprintf_inline
-#define wine_dbg_printf wine_dbg_printf_inline
-#define wine_dbg_log wine_dbg_log_inline
-#define wine_dbgstr_an wine_dbgstr_an_inline
-#define wine_dbgstr_wn wine_dbgstr_wn_inline
#include "wine/debug.h"
#include "wine/library.h"
@@ -70,8 +67,7 @@ static int cmp_name( const void *p1, const void *p2 )
}
/* get the flags to use for a given channel, possibly setting them too in case of lazy init */
-#undef __wine_dbg_get_channel_flags
-unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel )
+unsigned char __wine_dbg_get_channel_flags_obsolete( struct __wine_debug_channel *channel )
{
if (nb_debug_options == -1) debug_init();
@@ -87,8 +83,8 @@ unsigned char __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel
}
/* set the flags to use for a given channel; return 0 if the channel is not available to set */
-int __wine_dbg_set_channel_flags( struct __wine_debug_channel *channel,
- unsigned char set, unsigned char clear )
+int __wine_dbg_set_channel_flags_obsolete( struct __wine_debug_channel *channel,
+ unsigned char set, unsigned char clear )
{
if (nb_debug_options == -1) debug_init();
@@ -228,8 +224,7 @@ static void debug_init(void)
}
/* varargs wrapper for funcs.dbg_vprintf */
-#undef wine_dbg_printf
-int wine_dbg_printf( const char *format, ... )
+int wine_dbg_printf_obsolete( const char *format, ... )
{
int ret;
va_list valist;
@@ -241,8 +236,7 @@ int wine_dbg_printf( const char *format, ... )
}
/* printf with temp buffer allocation */
-#undef wine_dbg_sprintf
-const char *wine_dbg_sprintf( const char *format, ... )
+const char *wine_dbg_sprintf_obsolete( const char *format, ... )
{
static const int max_size = 200;
char *ret;
@@ -260,14 +254,13 @@ const char *wine_dbg_sprintf( const char *format, ... )
/* varargs wrapper for funcs.dbg_vlog */
-#undef wine_dbg_log
-int wine_dbg_log( enum __wine_debug_class cls, struct __wine_debug_channel *channel,
- const char *func, const char *format, ... )
+int wine_dbg_log_obsolete( enum __wine_debug_class cls, struct __wine_debug_channel *channel,
+ const char *func, const char *format, ... )
{
int ret;
va_list valist;
- if (!(__wine_dbg_get_channel_flags( channel ) & (1 << cls))) return -1;
+ if (!(__wine_dbg_get_channel_flags_obsolete( channel ) & (1 << cls))) return -1;
va_start(valist, format);
ret = funcs.dbg_vlog( cls, channel, func, format, valist );
@@ -424,7 +417,7 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch
int ret = 0;
if (cls < ARRAY_SIZE(debug_classes))
- ret += wine_dbg_printf( "%s:%s:%s ", debug_classes[cls], channel->name, func );
+ ret += wine_dbg_printf_obsolete( "%s:%s:%s ", debug_classes[cls], channel->name, func );
if (format)
ret += funcs.dbg_vprintf( format, args );
return ret;
@@ -432,20 +425,18 @@ static int default_dbg_vlog( enum __wine_debug_class cls, struct __wine_debug_ch
/* wrappers to use the function pointers */
-#undef wine_dbgstr_an
-const char *wine_dbgstr_an( const char * s, int n )
+const char *wine_dbgstr_an_obsolete( const char * s, int n )
{
return funcs.dbgstr_an(s, n);
}
-#undef wine_dbgstr_wn
-const char *wine_dbgstr_wn( const WCHAR *s, int n )
+const char *wine_dbgstr_wn_obsolete( const WCHAR *s, int n )
{
return funcs.dbgstr_wn(s, n);
}
-void __wine_dbg_set_functions( const struct __wine_debug_functions *new_funcs,
- struct __wine_debug_functions *old_funcs, size_t size )
+void __wine_dbg_set_functions_obsolete( const struct __wine_debug_functions *new_funcs,
+ struct __wine_debug_functions *old_funcs, size_t size )
{
if (old_funcs) memcpy( old_funcs, &funcs, min(sizeof(funcs),size) );
if (new_funcs) memcpy( &funcs, new_funcs, min(sizeof(funcs),size) );
@@ -460,3 +451,14 @@ static struct __wine_debug_functions funcs =
default_dbg_vprintf,
default_dbg_vlog
};
+
+__ASM_OBSOLETE(__wine_dbg_get_channel_flags);
+__ASM_OBSOLETE(__wine_dbg_set_channel_flags);
+__ASM_OBSOLETE(__wine_dbg_set_functions);
+__ASM_OBSOLETE(wine_dbg_log);
+__ASM_OBSOLETE(wine_dbg_printf);
+__ASM_OBSOLETE(wine_dbg_sprintf);
+__ASM_OBSOLETE(wine_dbgstr_an);
+__ASM_OBSOLETE(wine_dbgstr_wn);
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/wine/wine.map b/libs/wine/wine.map
index 83ef3a0f60..50ae479788 100644
--- a/libs/wine/wine.map
+++ b/libs/wine/wine.map
@@ -1,9 +1,6 @@
WINE_1.0
{
global:
- __wine_dbg_get_channel_flags;
- __wine_dbg_set_channel_flags;
- __wine_dbg_set_functions;
__wine_dll_register;
__wine_main_argc;
__wine_main_argv;
@@ -19,11 +16,6 @@ WINE_1.0
wine_cp_wcstombs;
wine_cpsymbol_mbstowcs;
wine_cpsymbol_wcstombs;
- wine_dbg_log;
- wine_dbg_printf;
- wine_dbg_sprintf;
- wine_dbgstr_an;
- wine_dbgstr_wn;
wine_dlclose;
wine_dll_enum_load_path;
wine_dll_get_owner;
@@ -76,6 +68,9 @@ WINE_1.0
/* the following functions are obsolete and only exported for backwards compatibility */
+ __wine_dbg_get_channel_flags;
+ __wine_dbg_set_channel_flags;
+ __wine_dbg_set_functions;
atoiW;
atolW;
get_char_typeW;
@@ -117,6 +112,11 @@ WINE_1.0
vsnprintfW;
vsprintfW;
wine_call_on_stack;
+ wine_dbg_log;
+ wine_dbg_printf;
+ wine_dbg_sprintf;
+ wine_dbgstr_an;
+ wine_dbgstr_wn;
wine_pthread_get_functions;
wine_pthread_set_functions;
wine_switch_to_stack;
More information about the wine-cvs
mailing list