From 901b89e37bb8e71224ee76987679010ff3c93c05 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 26 Mar 2013 15:21:57 +0200 Subject: Get rid of obsolete parse_version helper function. For getting the server's version in numeric form, use PQserverVersion(). It does the exact same parsing as dumputils.c's parse_version(), and has been around in libpq for a long time. For the client's version, just use the PG_VERSION_NUM constant. --- src/bin/pg_dump/pg_dumpall.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/bin/pg_dump/pg_dumpall.c') diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index b26aa99f03f..040cd94e5b5 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -1873,21 +1873,15 @@ connectDatabase(const char *dbname, const char *connection_string, fprintf(stderr, _("%s: could not get server version\n"), progname); exit_nicely(1); } - server_version = parse_version(remoteversion_str); - if (server_version < 0) + server_version = PQserverVersion(conn); + if (server_version == 0) { fprintf(stderr, _("%s: could not parse server version \"%s\"\n"), progname, remoteversion_str); exit_nicely(1); } - my_version = parse_version(PG_VERSION); - if (my_version < 0) - { - fprintf(stderr, _("%s: could not parse version \"%s\"\n"), - progname, PG_VERSION); - exit_nicely(1); - } + my_version = PG_VERSION_NUM; /* * We allow the server to be back to 7.0, and up to any minor release of -- cgit v1.2.3