From 2ebcd121474f69f8e8111cd1ebf8b24669e45289 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 8 Dec 2013 23:37:40 +0000 Subject: [PATCH] Use warning_puts instead of warning_printf where possible --- similar/main/dumpmine.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/similar/main/dumpmine.cpp b/similar/main/dumpmine.cpp index b7ad14a53..f4ff75448 100644 --- a/similar/main/dumpmine.cpp +++ b/similar/main/dumpmine.cpp @@ -105,8 +105,16 @@ static void err_printf(PHYSFS_file *my_file, const char * format, ... ) err_puts(my_file, message); } +static void warning_puts(PHYSFS_file *f, const char *str) __attribute_nonnull(); +static void warning_puts(PHYSFS_file *f, const char *str) +{ + con_puts(CON_URGENT, str); + PHYSFSX_puts(f, str); +} + static void warning_printf(PHYSFS_file *my_file, const char * format, ... ) __attribute_format_printf(2, 3); static void warning_printf(PHYSFS_file *my_file, const char * format, ... ) +#define warning_printf(A1,F,...) dxx_call_printf_checked(warning_printf,warning_puts,(A1),(F),##__VA_ARGS__) { va_list args; char message[256]; @@ -114,9 +122,7 @@ static void warning_printf(PHYSFS_file *my_file, const char * format, ... ) va_start(args, format ); vsnprintf(message,sizeof(message),format,args); va_end(args); - - con_puts(CON_URGENT, message); - PHYSFSX_printf(my_file, "%s", message); + warning_puts(my_file, message); } // ----------------------------------------------------------------------------