TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use Warning_puts instead of Warning where possible

Browse source
This commit is contained in:
Kp 2013-12-08 23:37:40 +00:00
parent 335cabcc79
commit f82ba904bd
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/include/dxxerror.h
View file

@ -23,6 +23,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include <stdio.h>
#include "dxxsconf.h"
#include <assert.h>
#include "fmtcheck.h"
#ifdef __cplusplus
@ -34,7 +35,9 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
void warn_printf(const char *s);
int error_init(void (*func)(const char *)); //init error system, returns 0=ok
void Warning_puts(const char *str) __attribute_nonnull();
void Warning(const char *fmt,...) __attribute_format_printf(1, 2); //print out warning message to user
#define Warning(F,...) dxx_call_printf_checked(Warning,Warning_puts,(),(F),##__VA_ARGS__)
void set_warn_func(void (*f)(const char *s));//specifies the function to call with warning messages
void clear_warn_func();//say this function no longer valid
void Error(const char *func, unsigned line, const char *fmt,...) __noreturn __attribute_format_printf(3, 4); //exit with error code=1, print message

14
common/misc/error.cpp
View file

@ -30,8 +30,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
static void (*ErrorPrintFunc)(const char *);
static char warn_message[MAX_MSG_LEN];
//takes string in register, calls printf with string on stack
void warn_printf(const char *s)
{
@ -79,14 +77,24 @@ void (Error)(const char *func, const unsigned line, const char *fmt,...)
exit(1);
}
void Warning_puts(const char *str)
{
if (warn_func == NULL)
return;
char warn_message[MAX_MSG_LEN];
snprintf(warn_message, sizeof(warn_message), "Warning: %s", str);
(*warn_func)(warn_message);
}
//print out warning message to user
void Warning(const char *fmt,...)
void (Warning)(const char *fmt,...)
{
va_list arglist;
if (warn_func == NULL)
return;
char warn_message[MAX_MSG_LEN];
strcpy(warn_message,"Warning: ");
va_start(arglist,fmt);