[mkgmap-dev] Commit r4382: code cleanup using hints from sonarlint, no change in output expected