Fix "warning: declaration shadows a local variable [-Wshadow]" warnings

Fixes for when warnings are on for hidden local vars - GCC_WARN_SHADOW = YES