diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2013-10-01 21:24:56 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2013-10-09 22:48:41 -0400 |
| commit | 264aa14a2f687eba8c8cc2a5b6cbd6397973da98 (patch) | |
| tree | fa09ac5e9755f556542e71c4f74d8881438822a2 /contrib/pg_upgrade/page.c | |
| parent | 261c7d4b653bc3e44c31fd456d94f292caa50d8f (diff) | |
pg_upgrade: Split off pg_fatal() from pg_log()
This allows decorating pg_fatal() with noreturn compiler hints, leading
to better diagnostics.
Reviewed-by: Marko Tiikkaja <marko@joh.to>
Diffstat (limited to 'contrib/pg_upgrade/page.c')
| -rw-r--r-- | contrib/pg_upgrade/page.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pg_upgrade/page.c b/contrib/pg_upgrade/page.c index 8f8527df5c6..3b3e1d95ee8 100644 --- a/contrib/pg_upgrade/page.c +++ b/contrib/pg_upgrade/page.c @@ -65,7 +65,7 @@ setupPageConverter(void) */ if ((converter = loadConverterPlugin(newPageVersion, oldPageVersion)) == NULL) - pg_log(PG_FATAL, "could not find plugin to convert from old page layout to new page layout\n"); + pg_fatal("could not find plugin to convert from old page layout to new page layout\n"); return converter; } @@ -91,10 +91,10 @@ getPageVersion(uint16 *version, const char *pathName) ssize_t bytesRead; if ((relfd = open(pathName, O_RDONLY, 0)) < 0) - pg_log(PG_FATAL, "could not open relation %s\n", pathName); + pg_fatal("could not open relation %s\n", pathName); if ((bytesRead = read(relfd, &page, sizeof(page))) != sizeof(page)) - pg_log(PG_FATAL, "could not read page header of %s\n", pathName); + pg_fatal("could not read page header of %s\n", pathName); *version = PageGetPageLayoutVersion(&page); |