Fix shadowed variable usage.

Verified with EXTRA_CFLAGS=-Wshadow.
26 files changed