From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sat, 8 Jan 2005 21:38:17 +0000 (+0000)
Subject: More CfgName issues.
X-Git-Tag: V2.12.0~477
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a456e503e477fdf860f63c6f52c642ab5a4a0e16;p=cc65

More CfgName issues.
Use CfgError instead of calling Error directly.
Use dynamically allocated string buffers in the CfgError and CfgWarning
functions.


git-svn-id: svn://svn.cc65.org/cc65/trunk@3359 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/src/ld65/scanner.c b/src/ld65/scanner.c
index 5576a32d3..8767c368c 100644
--- a/src/ld65/scanner.c
+++ b/src/ld65/scanner.c
@@ -41,6 +41,7 @@
 
 /* common */
 #include "chartype.h"
+#include "strbuf.h"
 #include "xsprintf.h"
 
 /* ld65 */
@@ -86,14 +87,15 @@ static FILE*   	       	InputFile    	= 0;
 void CfgWarning (const char* Format, ...)
 /* Print a warning message adding file name and line number of the config file */
 {
-    char Buf [512];
+    StrBuf Buf = STATIC_STRBUF_INITIALIZER;
     va_list ap;
 
     va_start (ap, Format);
-    xvsprintf (Buf, sizeof (Buf), Format, ap);
+    SB_VPrintf (&Buf, Format, ap);
     va_end (ap);
 
-    Warning ("%s(%u): %s", CfgGetName(), CfgErrorLine, Buf);
+    Warning ("%s(%u): %s", CfgGetName(), CfgErrorLine, SB_GetConstBuf (&Buf));
+    DoneStrBuf (&Buf);
 }
 
 
@@ -101,14 +103,15 @@ void CfgWarning (const char* Format, ...)
 void CfgError (const char* Format, ...)
 /* Print an error message adding file name and line number of the config file */
 {
-    char Buf [512];
+    StrBuf Buf = STATIC_STRBUF_INITIALIZER;
     va_list ap;
 
     va_start (ap, Format);
-    xvsprintf (Buf, sizeof (Buf), Format, ap);
+    SB_VPrintf (&Buf, Format, ap);
     va_end (ap);
 
-    Error ("%s(%u): %s", CfgGetName(), CfgErrorLine, Buf);
+    Error ("%s(%u): %s", CfgGetName(), CfgErrorLine, SB_GetConstBuf (&Buf));
+    DoneStrBuf (&Buf);
 }
 
 
@@ -197,7 +200,7 @@ Again:
     if (C == '$') {
 	NextChar ();
 	if (!isxdigit (C)) {
-	    Error ("%s(%u): Hex digit expected", CfgGetName(), InputLine);
+	    CfgError ("Hex digit expected");
 	}
 	CfgIVal = 0;
 	while (isxdigit (C)) {
@@ -262,7 +265,7 @@ Again:
 	    I = 0;
 	    while (C != '\"') {
 		if (C == EOF || C == '\n') {
-		    Error ("%s(%u): Unterminated string", CfgName, InputLine);
+		    CfgError ("Unterminated string");
 		}
 	       	if (I < CFG_MAX_IDENT_LEN) {
 		    CfgSVal [I++] = C;
@@ -316,7 +319,7 @@ Again:
 	    break;
 
 	default:
-	    Error ("%s(%u): Invalid character `%c'", CfgGetName(), InputLine, C);
+	    CfgError ("Invalid character `%c'", C);
 
     }
 }
@@ -436,7 +439,7 @@ void CfgSpecialToken (const IdentTok* Table, unsigned Size, const char* Name)
     }
 
     /* Not found or no identifier */
-    Error ("%s(%u): %s expected", CfgGetName(), InputLine, Name);
+    CfgError ("%s expected", Name);
 }