pgsql: Fix assorted inconsistent function declarations.

Fix assorted inconsistent function declarations.

While gcc doesn't complain if you declare a function "static" and then
define it not-static, other compilers do; and in any case the code is
highly misleading this way.  Add the missing "static" keywords to a
couple of recent patches.  Per buildfarm member pademelon.

Branch
------
REL9_1_STABLE

Details
-------
http://git.postgresql.org/pg/commitdiff/c68b06356dd75230df18a763b87736f717e13b5c

Modified Files
--------------
contrib/pg_upgrade/pg_upgrade.c     |    2 +-
src/bin/pg_resetxlog/pg_resetxlog.c |    2 +-
2 files changed, 2 insertions(+), 2 deletions(-)