aboutsummaryrefslogtreecommitdiff
path: root/src/bin/pg_dump/pg_dumpall.c
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2013-03-26 15:21:57 +0200
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2013-03-26 15:32:02 +0200
commit901b89e37bb8e71224ee76987679010ff3c93c05 (patch)
tree53e8156f6a64650c34c01f3de722ab540b613c5f /src/bin/pg_dump/pg_dumpall.c
parentec143f94051779bb5d07419723529b4cc4fcce95 (diff)
downloadpostgresql-901b89e37bb8e71224ee76987679010ff3c93c05.tar.gz
postgresql-901b89e37bb8e71224ee76987679010ff3c93c05.zip
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.
Diffstat (limited to 'src/bin/pg_dump/pg_dumpall.c')
-rw-r--r--src/bin/pg_dump/pg_dumpall.c12
1 files changed, 3 insertions, 9 deletions
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