# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1645977513 -7200
# Node ID 56510bd4c66bc4ca3b7b1b9bae086cfb5b65c861
# Parent  ac2e60f4bfc35a7970dbfe40b5cd710c0f492c2e
Cleanup.

diff -r ac2e60f4bfc3 -r 56510bd4c66b tools/objlink.c
--- a/tools/objlink.c	Sun Feb 27 17:58:20 2022 +0200
+++ b/tools/objlink.c	Sun Feb 27 17:58:33 2022 +0200
@@ -913,20 +913,24 @@
 
     // Check for overlapping conflicts
     hasOverlaps = FALSE;
-    for (int i = 0; i < nmemBlocks; i++)
-    for (int j = 0; j < nmemBlocks; j++)
-    if (j != i && memBlocks[i].type == MTYPE_RES)
+    for (int bk1 = 0; bk1 < nmemBlocks; bk1++)
+    for (int bk2 = 0; bk2 < nmemBlocks; bk2++)
+    if (bk1 != bk2)
     {
-        DMMemBlock *mbi = &memBlocks[i],
-                   *mbj = &memBlocks[j];
+        DMMemBlock *mb1 = &memBlocks[bk1],
+                   *mb2 = &memBlocks[bk2];
+
+        if (mb1->type != MTYPE_RES)
+            continue;
 
         // Check for per-file conflicts
-        if ((mbj->start >= mbi->start && mbj->start <= mbi->end) ||
-            (mbj->end >= mbi->start && mbj->end <= mbi->end))
+        if ((mb2->start >= mb1->start && mb2->start <= mb1->end) ||
+            (mb2->end >= mb1->start && mb2->end <= mb1->end))
         {
-            dmPrint(1, "* '%s' and '%s' overlap ($%.4x-$%.4x  vs  $%.4x-$%.4x)\n",
-                mbi->name, mbj->name, mbi->start,
-                mbi->end, mbj->start, mbj->end);
+            dmErrorMsg("* '%s' and '%s' overlap ($%.4x-$%.4x  vs  $%.4x-$%.4x)\n",
+                mb1->name, mb2->name, mb1->start,
+                mb1->end, mb2->start, mb2->end);
+
             hasOverlaps = TRUE;
         }
     }