From: Laubzega <mileksmyk@gmail.com>
Date: Thu, 6 Sep 2018 07:18:39 +0000 (-0700)
Subject: Rename more stuff from "overlay" to "replace".
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c7bb27bac9ee3a55d08692f250ab3763fc0b1dca;p=cc65

Rename more stuff from "overlay" to "replace".
---

diff --git a/src/ld65/bin.c b/src/ld65/bin.c
index c94ac9319..6f0e4ab36 100644
--- a/src/ld65/bin.c
+++ b/src/ld65/bin.c
@@ -193,7 +193,7 @@ static void BinWriteMem (BinDesc* D, MemoryArea* M)
                     NewAddr += M->Start;
                 }
                 if (DoWrite || (M->Flags & MF_FILL) != 0) {
-                    /* Seek in "overlay" segments */
+                    /* Seek in "replace" segments */
                     if (S->Flags & SF_REPLACE) {
                         fseek (D->F, NewAddr - M->Start, SEEK_SET);
                     } else {
diff --git a/src/ld65/config.c b/src/ld65/config.c
index 5c61bdd3f..0e4d0c1e4 100644
--- a/src/ld65/config.c
+++ b/src/ld65/config.c
@@ -1797,7 +1797,7 @@ unsigned CfgProcess (void)
     for (I = 0; I < CollCount (&MemoryAreas); ++I) {
         unsigned J;
         unsigned long Addr;
-        unsigned Overlays = 0;
+        unsigned Replaces = 0;
 
         /* Get the next memory area */
         MemoryArea* M = CollAtUnchecked (&MemoryAreas, I);
@@ -1851,23 +1851,23 @@ unsigned CfgProcess (void)
             /* Remember the start address before handling this segment */
             unsigned long StartAddr = Addr;
 
-            /* Take note of overlayed segments and make sure there are no other
+            /* Take note of "replace" segments and make sure there are no other
             ** segment types following them in current memory region.
             */
             if (S->Flags & SF_REPLACE) {
                 if (S->Flags & (SF_OFFSET | SF_START)) {
-                    ++Overlays;
+                    ++Replaces;
                 } else {
                     CfgError (GetSourcePos (M->LI),
-                              "Segment `%s' of type `overlay' requires either"
+                              "Segment `%s' of type `replace' requires either"
                               " `Start' or `Offset' attribute to be specified",
                               GetString (S->Name));
                 }
             } else {
-                if (Overlays > 0) {
+                if (Replaces > 0) {
                     CfgError (GetSourcePos (M->LI),
                               "Segment `%s' is preceded by at least one segment"
-                              " of type `overlay'",
+                              " of type `replace'",
                               GetString (S->Name));
                 }
             }