[mkgmap-dev] Commit r4468: fix some issues reported by sonarlint, no functional change