A few smaller issues found by sparse, some code that was
never used, two instances of '0' instead of 'NULL' and
local variables shadowing another one.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>