From 1c12fd33d01105a79689351ef370630783875d22 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 28 Jan 2008 08:48:16 +0000 Subject: Get rid of redundant dbg_printf redefinition. Fixes some warnings: wine/debugtools.h:57: warning: useless type name in empty declaration git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25898 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/pe_image.c | 28 ++++++++++++++-------------- loader/wine/debugtools.h | 9 --------- 2 files changed, 14 insertions(+), 23 deletions(-) (limited to 'loader') diff --git a/loader/pe_image.c b/loader/pe_image.c index 19cd36791c..16f1259b5c 100644 --- a/loader/pe_image.c +++ b/loader/pe_image.c @@ -96,17 +96,17 @@ static void dump_exports( HMODULE hModule ) if (!*function) continue; if (TRACE_ON(win32)) { - DPRINTF( "%4ld %08lx %p", i + pe_exports->Base, *function, RVA(*function) ); + dbg_printf( "%4ld %08lx %p", i + pe_exports->Base, *function, RVA(*function) ); for (j = 0; j < pe_exports->NumberOfNames; j++) if (ordinal[j] == i) { - DPRINTF( " %s", (char*)RVA(name[j]) ); + dbg_printf( " %s", (char*)RVA(name[j]) ); break; } if ((*function >= rva_start) && (*function <= rva_end)) - DPRINTF(" (forwarded -> %s)", (char *)RVA(*function)); - DPRINTF("\n"); + dbg_printf(" (forwarded -> %s)", (char *)RVA(*function)); + dbg_printf("\n"); } } } @@ -484,19 +484,19 @@ HMODULE PE_LoadImage( int handle, LPCSTR filename, WORD *version ) if ( nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386 ) { - MESSAGE("Trying to load PE image for unsupported architecture ("); + dbg_printf("Trying to load PE image for unsupported architecture ("); switch (nt->FileHeader.Machine) { - case IMAGE_FILE_MACHINE_UNKNOWN: MESSAGE("Unknown"); break; - case IMAGE_FILE_MACHINE_I860: MESSAGE("I860"); break; - case IMAGE_FILE_MACHINE_R3000: MESSAGE("R3000"); break; - case IMAGE_FILE_MACHINE_R4000: MESSAGE("R4000"); break; - case IMAGE_FILE_MACHINE_R10000: MESSAGE("R10000"); break; - case IMAGE_FILE_MACHINE_ALPHA: MESSAGE("Alpha"); break; - case IMAGE_FILE_MACHINE_POWERPC: MESSAGE("PowerPC"); break; - default: MESSAGE("Unknown-%04x", nt->FileHeader.Machine); break; + case IMAGE_FILE_MACHINE_UNKNOWN: dbg_printf("Unknown"); break; + case IMAGE_FILE_MACHINE_I860: dbg_printf("I860"); break; + case IMAGE_FILE_MACHINE_R3000: dbg_printf("R3000"); break; + case IMAGE_FILE_MACHINE_R4000: dbg_printf("R4000"); break; + case IMAGE_FILE_MACHINE_R10000: dbg_printf("R10000"); break; + case IMAGE_FILE_MACHINE_ALPHA: dbg_printf("Alpha"); break; + case IMAGE_FILE_MACHINE_POWERPC: dbg_printf("PowerPC"); break; + default: dbg_printf("Unknown-%04x", nt->FileHeader.Machine); break; } - MESSAGE(")\n"); + dbg_printf(")\n"); goto error; } diff --git a/loader/wine/debugtools.h b/loader/wine/debugtools.h index 53b0b7e766..49b9422bde 100644 --- a/loader/wine/debugtools.h +++ b/loader/wine/debugtools.h @@ -53,12 +53,6 @@ extern int dbg_vprintf( const char *format, va_list args ); static inline LPCSTR debugstr_a( LPCSTR s ) { return debugstr_an( s, 80 ); } static inline LPCSTR debugstr_w( LPCWSTR s ) { return debugstr_wn( s, 80 ); } -#ifdef __GNUC__ -extern int dbg_printf(const char *format, ...) __attribute__((format (printf,1,2))); -#else -extern int dbg_printf(const char *format, ...); -#endif - #define TRACE_(X) TRACE #define WARN_(X) TRACE #define WARN TRACE @@ -75,7 +69,4 @@ extern int dbg_printf(const char *format, ...); #define DEFAULT_DEBUG_CHANNEL(ch) \ extern char dbch_##ch[]; static char * const __dbch_default = dbch_##ch; -#define DPRINTF dbg_printf -#define MESSAGE dbg_printf - #endif /* WINE_DEBUGTOOLS_H */ -- cgit v1.2.3