Use xsprintf in common library
git-svn-id: svn://svn.cc65.org/cc65/trunk@32 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
@@ -39,6 +39,8 @@
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "../common/xsprintf.h"
|
||||
|
||||
#include "global.h"
|
||||
#include "error.h"
|
||||
#include "scanner.h"
|
||||
@@ -65,7 +67,7 @@ static const char* CfgName = 0;
|
||||
static const char* CfgBuf = 0;
|
||||
|
||||
/* Other input stuff */
|
||||
static int C = ' ';
|
||||
static int C = ' ';
|
||||
static unsigned InputLine = 1;
|
||||
static unsigned InputCol = 0;
|
||||
static FILE* InputFile = 0;
|
||||
@@ -73,7 +75,7 @@ static FILE* InputFile = 0;
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Error handling */
|
||||
/* Error handling */
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
@@ -83,12 +85,11 @@ void CfgWarning (const char* Format, ...)
|
||||
{
|
||||
char Buf [512];
|
||||
va_list ap;
|
||||
|
||||
va_start (ap, Format);
|
||||
#ifdef __WATCOMC__
|
||||
_vbprintf (Buf, sizeof (Buf), Format, ap);
|
||||
#else
|
||||
vsnprintf (Buf, sizeof (Buf), Format, ap);
|
||||
#endif
|
||||
xvsprintf (Buf, sizeof (Buf), Format, ap);
|
||||
va_end (ap);
|
||||
|
||||
Warning ("%s(%u): %s", CfgName, CfgErrorLine, Buf);
|
||||
}
|
||||
|
||||
@@ -99,12 +100,11 @@ void CfgError (const char* Format, ...)
|
||||
{
|
||||
char Buf [512];
|
||||
va_list ap;
|
||||
|
||||
va_start (ap, Format);
|
||||
#ifdef __WATCOMC__
|
||||
_vbprintf (Buf, sizeof (Buf), Format, ap);
|
||||
#else
|
||||
vsnprintf (Buf, sizeof (Buf), Format, ap);
|
||||
#endif
|
||||
xvsprintf (Buf, sizeof (Buf), Format, ap);
|
||||
va_end (ap);
|
||||
|
||||
Error ("%s(%u): %s", CfgName, CfgErrorLine, Buf);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user