1 files changed, 20 insertions, 34 deletions

diff --git a/contrib/pg_upgrade/page.c b/contrib/pg_upgrade/page.c
index c76d049631e..d11d227fa93 100644
--- a/contrib/pg_upgrade/page.c
+++ b/contrib/pg_upgrade/page.c
@@ -17,7 +17,7 @@
 #ifdef PAGE_CONVERSION
 
 
-static const char *getPageVersion(
+static void getPageVersion(
 			   uint16 *version, const char *pathName);
 static pageCnvCtx *loadConverterPlugin(
 					uint16 newPageVersion, uint16 oldPageVersion);
@@ -33,13 +33,9 @@ static pageCnvCtx *loadConverterPlugin(
  *	to the new format.	If the versions are identical, this function just
  *	returns a NULL pageCnvCtx pointer to indicate that page-by-page conversion
  *	is not required.
- *
- *	If successful this function sets *result and returns NULL.	If an error
- *	occurs, this function returns an error message in the form of an null-terminated
- *	string.
  */
-const char *
-setupPageConverter(pageCnvCtx **result)
+pageCnvCtx *
+setupPageConverter(void)
 {
 	uint16		oldPageVersion;
 	uint16		newPageVersion;
@@ -53,35 +49,28 @@ setupPageConverter(pageCnvCtx **result)
 	snprintf(srcName, sizeof(srcName), "%s/global/%u", old_cluster.pgdata,
 			 old_cluster.pg_database_oid);
 
-	if ((msg = getPageVersion(&oldPageVersion, srcName)) != NULL)
-		return msg;
-
-	if ((msg = getPageVersion(&newPageVersion, dstName)) != NULL)
-		return msg;
+	getPageVersion(&oldPageVersion, srcName);
+	getPageVersion(&newPageVersion, dstName);
 
 	/*
 	 * If the old cluster and new cluster use the same page layouts, then we
 	 * don't need a page converter.
 	 */
-	if (newPageVersion == oldPageVersion)
+	if (newPageVersion != oldPageVersion)
 	{
-		*result = NULL;
-		return NULL;
-	}
-
-	/*
-	 * The clusters use differing page layouts, see if we can find a plugin
-	 * that knows how to convert from the old page layout to the new page
-	 * layout.
-	 */
+		/*
+		 * The clusters use differing page layouts, see if we can find a plugin
+		 * that knows how to convert from the old page layout to the new page
+		 * layout.
+		 */
+	
+		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");
 
-	if ((converter = loadConverterPlugin(newPageVersion, oldPageVersion)) == NULL)
-		return "could not find plugin to convert from old page layout to new page layout";
+		return converter;
+	}
 	else
-	{
-		*result = converter;
 		return NULL;
-	}
 }
 
 
@@ -94,7 +83,7 @@ setupPageConverter(pageCnvCtx **result)
  *	if an error occurs, this function returns an error message (in the form
  *	of a null-terminated string).
  */
-static const char *
+static void
 getPageVersion(uint16 *version, const char *pathName)
 {
 	int			relfd;
@@ -102,19 +91,16 @@ getPageVersion(uint16 *version, const char *pathName)
 	ssize_t		bytesRead;
 
 	if ((relfd = open(pathName, O_RDONLY, 0)) < 0)
-		return "could not open relation";
+		pg_log(PG_FATAL, "could not open relation %s\n", pathName);
 
 	if ((bytesRead = read(relfd, &page, sizeof(page))) != sizeof(page))
-	{
-		close(relfd);
-		return "could not read page header";
-	}
+		pg_log(PG_FATAL, "could not read page header of %s\n", pathName);
 
 	*version = PageGetPageLayoutVersion(&page);
 
 	close(relfd);
 
-	return NULL;
+	return;
 }