From 4ea94a9302b8946f452fe14667fa1deaba52bbe7 Mon Sep 17 00:00:00 2001 From: cuz Date: Thu, 23 Nov 2000 19:14:15 +0000 Subject: [PATCH] Use "[linker generated]" as source for linker generated symbols. git-svn-id: svn://svn.cc65.org/cc65/trunk@478 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/ld65/objdata.c | 20 ++++++++++---------- src/ld65/objdata.h | 4 ++-- src/ld65/segments.c | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/ld65/objdata.c b/src/ld65/objdata.c index 085468da9..ce88775dc 100644 --- a/src/ld65/objdata.c +++ b/src/ld65/objdata.c @@ -115,35 +115,35 @@ void FreeObjData (ObjData* O) const char* GetObjFileName (const ObjData* O) -/* Get the name of the object file. Return "(linker generated)" if the object +/* Get the name of the object file. Return "[linker generated]" if the object * file is NULL. */ { - return O? O->Name : "(linker generated)"; + return O? O->Name : "[linker generated]"; } const char* GetSourceFileName (const ObjData* O, unsigned Index) /* Get the name of the source file with the given index. If O is NULL, return - * "(linker generated)" as the file name. + * "[linker generated]" as the file name. */ -{ +{ /* Check if we have an object file */ if (O == 0) { - - /* No object file */ - return "(linker generated)"; + + /* No object file */ + return "[linker generated]"; } else { - + /* Check the parameter */ PRECONDITION (Index < O->FileCount); - + /* Return the name */ return O->Files[Index]; - } + } } diff --git a/src/ld65/objdata.h b/src/ld65/objdata.h index 92202977f..1fa339944 100644 --- a/src/ld65/objdata.h +++ b/src/ld65/objdata.h @@ -98,13 +98,13 @@ void FreeObjData (ObjData* O); /* Free a complete struct */ const char* GetObjFileName (const ObjData* O); -/* Get the name of the object file. Return "(linker generated)" if the object +/* Get the name of the object file. Return "[linker generated]" if the object * file is NULL. */ const char* GetSourceFileName (const ObjData* O, unsigned Index); /* Get the name of the source file with the given index. If O is NULL, return - * "(linker generated)" as the file name. + * "[linker generated]" as the file name. */ diff --git a/src/ld65/segments.c b/src/ld65/segments.c index e41dcdeac..aa0251c38 100644 --- a/src/ld65/segments.c +++ b/src/ld65/segments.c @@ -153,7 +153,7 @@ Segment* GetSegment (const char* Name, unsigned char Type, const char* ObjName) if (S->Type != Type) { /* Allow an empty object name */ if (ObjName == 0) { - ObjName = "(linker generated)"; + ObjName = "[linker generated]"; } Error ("Module `%s': Type mismatch for segment `%s'", ObjName, Name); } @@ -505,13 +505,13 @@ void SegWrite (FILE* Tgt, Segment* S, SegWriteFunc F, void* Data) case SEG_EXPR_RANGE_ERROR: Error ("Range error in module `%s', line %lu", - GetSourceFileName (Frag->Obj, Frag->Pos.Name), + GetSourceFileName (Frag->Obj, Frag->Pos.Name), Frag->Pos.Line); break; case SEG_EXPR_TOO_COMPLEX: Error ("Expression too complex in module `%s', line %lu", - GetSourceFileName (Frag->Obj, Frag->Pos.Name), + GetSourceFileName (Frag->Obj, Frag->Pos.Name), Frag->Pos.Line); break; -- 2.39.5