6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-25 17:29:50 +00:00
Code Issues Projects Releases Wiki Activity

Use xsprintf in common library

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@32 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2000-06-08 18:18:40 +00:00
parent 12b2ee8f60
commit b05c1e1111
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ld65/scanner.c
View File

@ -39,6 +39,8 @@
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#include "../common/xsprintf.h"
#include "global.h" #include "global.h"
#include "error.h" #include "error.h"
#include "scanner.h" #include "scanner.h"
@ -65,7 +67,7 @@ static const char* CfgName = 0;
static const char* CfgBuf = 0; static const char* CfgBuf = 0;
/* Other input stuff */ /* Other input stuff */
static int C = ' '; static int C = ' ';
static unsigned InputLine = 1; static unsigned InputLine = 1;
static unsigned InputCol = 0; static unsigned InputCol = 0;
static FILE* InputFile = 0; static FILE* InputFile = 0;
@ -73,7 +75,7 @@ static FILE* InputFile = 0;
/*****************************************************************************/ /*****************************************************************************/
/* Error handling */ /* Error handling */
/*****************************************************************************/ /*****************************************************************************/
@ -82,13 +84,12 @@ void CfgWarning (const char* Format, ...)
/* Print a warning message adding file name and line number of the config file */ /* Print a warning message adding file name and line number of the config file */
{ {
char Buf [512]; char Buf [512];
va_list ap; va_list ap;
va_start (ap, Format); va_start (ap, Format);
#ifdef __WATCOMC__ xvsprintf (Buf, sizeof (Buf), Format, ap);
_vbprintf (Buf, sizeof (Buf), Format, ap); va_end (ap);
#else
vsnprintf (Buf, sizeof (Buf), Format, ap);
#endif
Warning ("%s(%u): %s", CfgName, CfgErrorLine, Buf); Warning ("%s(%u): %s", CfgName, CfgErrorLine, Buf);
} }
@ -99,12 +100,11 @@ void CfgError (const char* Format, ...)
{ {
char Buf [512]; char Buf [512];
va_list ap; va_list ap;
va_start (ap, Format); va_start (ap, Format);
#ifdef __WATCOMC__ xvsprintf (Buf, sizeof (Buf), Format, ap);
_vbprintf (Buf, sizeof (Buf), Format, ap); va_end (ap);
#else
vsnprintf (Buf, sizeof (Buf), Format, ap);
#endif
Error ("%s(%u): %s", CfgName, CfgErrorLine, Buf); Error ("%s(%u): %s", CfgName, CfgErrorLine, Buf);
} }