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