Fixed several places were CfgName was used directly instead of calling

CfgGetName(). The former may be NULL, while the latter maps that to a
string like "builtin config".

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

diff --git a/src/ld65/scanner.c b/src/ld65/scanner.c
index 82a04010757c7287dd27884c9c8d0d01aeb984bc..5576a32d3c425008a571ec3c3a4ae4b81958e3ae 100644 (file)
--- a/src/ld65/scanner.c
+++ b/src/ld65/scanner.c
@@ -197,7 +197,7 @@ Again:
     if (C == '$') {
        NextChar ();
        if (!isxdigit (C)) {
-           Error ("%s(%u): Hex digit expected", CfgName, InputLine);
+           Error ("%s(%u): Hex digit expected", CfgGetName(), InputLine);
        }
        CfgIVal = 0;
        while (isxdigit (C)) {
@@ -316,7 +316,7 @@ Again:
            break;
 
        default:
-           Error ("%s(%u): Invalid character `%c'", CfgName, InputLine, C);
+           Error ("%s(%u): Invalid character `%c'", CfgGetName(), InputLine, C);
 
     }
 }
@@ -436,7 +436,7 @@ void CfgSpecialToken (const IdentTok* Table, unsigned Size, const char* Name)
     }
 
     /* Not found or no identifier */
-    Error ("%s(%u): %s expected", CfgName, InputLine, Name);
+    Error ("%s(%u): %s expected", CfgGetName(), InputLine, Name);
 }