From 3d79fe9b40edd51c0ad6976f56ad2d0e2a187583 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 8 Dec 2013 23:37:40 +0000 Subject: [PATCH] Use editor_status instead of editor_status_fmt where possible --- common/include/editor/editor.h | 2 ++ similar/editor/med.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/include/editor/editor.h b/common/include/editor/editor.h index 4842050b0..8b1412288 100644 --- a/common/include/editor/editor.h +++ b/common/include/editor/editor.h @@ -26,6 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "inferno.h" #include "gr.h" #include "ui.h" +#include "fmtcheck.h" struct window; struct segment; @@ -473,6 +474,7 @@ extern void clear_status_icon( char icon[1], int position ); // Editor status message. extern void editor_status_fmt(const char *format, ... ) __attribute_format_printf(1, 2); +#define editor_status_fmt(F,...) dxx_call_printf_checked(editor_status_fmt,editor_status,(),(F),##__VA_ARGS__) // Variables in editor.c that the k*.c files need diff --git a/similar/editor/med.cpp b/similar/editor/med.cpp index ea0431d27..bfccadd19 100644 --- a/similar/editor/med.cpp +++ b/similar/editor/med.cpp @@ -163,7 +163,7 @@ static char status_line[DIAGNOSTIC_MESSAGE_MAX] = ""; struct tm Editor_status_last_time; -void editor_status_fmt( const char *format, ... ) +void (editor_status_fmt)( const char *format, ... ) { va_list ap;