6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-07-04 13:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix a problem where the linker tries to print a NULL pointer if there is a

Browse Source 
problem with the builtin configuration that is used.


git-svn-id: svn://svn.cc65.org/cc65/trunk@1083 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz 2001-10-25 18:51:49 +00:00
parent efce8fa8d0
commit 62314aeac9
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ld65/scanner.c
View File

@ -92,7 +92,7 @@ void CfgWarning (const char* Format, ...)
xvsprintf (Buf, sizeof (Buf), Format, ap);
va_end (ap);
Warning ("%s(%u): %s", CfgName, CfgErrorLine, Buf);
Warning ("%s(%u): %s", CfgGetName(), CfgErrorLine, Buf);
}
@ -107,7 +107,7 @@ void CfgError (const char* Format, ...)
xvsprintf (Buf, sizeof (Buf), Format, ap);
va_end (ap);
Error ("%s(%u): %s", CfgName, CfgErrorLine, Buf);
Error ("%s(%u): %s", CfgGetName(), CfgErrorLine, Buf);
}
@ -125,7 +125,7 @@ static void NextChar (void)
/* Read from buffer */
C = (unsigned char)(*CfgBuf);
if (C == 0) {
C = EOF;
C = EOF;
} else {
++CfgBuf;
}
@ -254,7 +254,7 @@ Again:
case ':':
NextChar ();
CfgTok = CFGTOK_COLON;
break;
break;
case '\"':
NextChar ();
@ -297,7 +297,7 @@ Again:
CfgSVal [0] = '\0';
}
CfgTok = CFGTOK_STRCON;
break;
break;
case 'S':
NextChar ();
@ -426,7 +426,7 @@ void CfgSpecialToken (const IdentTok* Table, unsigned Size, const char* Name)
/* Linear search */
for (I = 0; I < Size; ++I) {
if (strcmp (CfgSVal, Table [I].Ident) == 0) {
if (strcmp (CfgSVal, Table [I].Ident) == 0) {
CfgTok = Table [I].Tok;
return;
}
@ -475,7 +475,13 @@ void CfgSetName (const char* Name)
const char* CfgGetName (void)
/* Get the name of the config file */
{
return CfgName? CfgName : "";
if (CfgName) {
return CfgName;
} else if (CfgBuf) {
return "[builtin config]";
} else {
return "";
}
}
@ -514,7 +520,7 @@ void CfgOpenInput (void)
/* Initialize variables */
C = ' ';
InputLine = 1;
InputLine = 1;
InputCol = 0;
/* Start the ball rolling ... */
@ -535,4 +541,4 @@ void CfgCloseInput (void)