Use Warning_puts instead of Warning where possible
This commit is contained in:
parent
335cabcc79
commit
f82ba904bd
|
@ -23,6 +23,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include "dxxsconf.h"
|
#include "dxxsconf.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include "fmtcheck.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
||||||
|
@ -34,7 +35,9 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
|
|
||||||
void warn_printf(const char *s);
|
void warn_printf(const char *s);
|
||||||
int error_init(void (*func)(const char *)); //init error system, returns 0=ok
|
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
|
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 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 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
|
void Error(const char *func, unsigned line, const char *fmt,...) __noreturn __attribute_format_printf(3, 4); //exit with error code=1, print message
|
||||||
|
|
|
@ -30,8 +30,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
||||||
|
|
||||||
static void (*ErrorPrintFunc)(const char *);
|
static void (*ErrorPrintFunc)(const char *);
|
||||||
|
|
||||||
static char warn_message[MAX_MSG_LEN];
|
|
||||||
|
|
||||||
//takes string in register, calls printf with string on stack
|
//takes string in register, calls printf with string on stack
|
||||||
void warn_printf(const char *s)
|
void warn_printf(const char *s)
|
||||||
{
|
{
|
||||||
|
@ -79,14 +77,24 @@ void (Error)(const char *func, const unsigned line, const char *fmt,...)
|
||||||
exit(1);
|
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
|
//print out warning message to user
|
||||||
void Warning(const char *fmt,...)
|
void (Warning)(const char *fmt,...)
|
||||||
{
|
{
|
||||||
va_list arglist;
|
va_list arglist;
|
||||||
|
|
||||||
if (warn_func == NULL)
|
if (warn_func == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
char warn_message[MAX_MSG_LEN];
|
||||||
strcpy(warn_message,"Warning: ");
|
strcpy(warn_message,"Warning: ");
|
||||||
|
|
||||||
va_start(arglist,fmt);
|
va_start(arglist,fmt);
|
||||||
|
|
Loading…
Reference in a new issue