pg_upgrade cleanup

I have applied the attached patch to clean up pg_upgrade cache lookup
code and remove useless NULL pointer tests.

--
Bruce Momjian <bruce@momjian.us> http://momjian.us
EnterpriseDB http://enterprisedb.com

+ It's impossible for everything to be true. +