[mkgmap-dev] Commit r3732: simplify o5m format reader, no functional change