Fix compiler warnings about variable declaration shadowing

[cgraf78]

Fix a couple of instances where a local variable declaration shadowed another variable. This was causing a compiler error when compiling with clang and treating most compiler warnings as errors (-Wall, -Wextra, -Werror).