Avoid shadowing variable when extracting ZIP64 extra header fields
Merge branch 'rename-var-shadow' into fix-warnings