From: Robert Haas <rhaas@postgresql.org>
Date: Fri, 12 Mar 2021 19:35:10 +0000 (-0500)
Subject: Try to fix compiler warnings.
X-Git-Tag: REL_14_BETA1~582
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d60e61de4fb4a8e7ca88204c2c409e7380887d76;p=thirdparty%2Fpostgresql.git

Try to fix compiler warnings.

Per report from Peter Geoghegan.

Discussion: http://postgr.es/m/CAH2-WznpwULZ3uJ1_6WXvNMXYbOy8k8tYs3r=qSdGmZeRd6tDw@mail.gmail.com
---

diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c
index fc624cd3dbc..bbad22e7a15 100644
--- a/src/bin/pg_amcheck/pg_amcheck.c
+++ b/src/bin/pg_amcheck/pg_amcheck.c
@@ -1643,6 +1643,8 @@ compile_database_list(PGconn *conn, SimplePtrList *databases,
 		}
 		else
 		{
+			DatabaseInfo *dat;
+
 			/* Current record pertains to a database */
 			Assert(datname != NULL);
 
@@ -1650,12 +1652,11 @@ compile_database_list(PGconn *conn, SimplePtrList *databases,
 			if (initial_dbname != NULL && strcmp(initial_dbname, datname) == 0)
 				continue;
 
-			DatabaseInfo *dat = (DatabaseInfo *) pg_malloc0(sizeof(DatabaseInfo));
-
 			/* This database is included.  Add to list */
 			if (opts.verbose)
 				pg_log_info("including database: \"%s\"", datname);
 
+			dat = (DatabaseInfo *) pg_malloc0(sizeof(DatabaseInfo));
 			dat->datname = pstrdup(datname);
 			simple_ptr_list_append(databases, dat);
 		}
@@ -2057,7 +2058,7 @@ compile_relation_list_one_db(PGconn *conn, SimplePtrList *relations,
 	{
 		int			pattern_id = -1;
 		bool		is_heap = false;
-		bool		is_btree = false;
+		bool		is_btree = false PG_USED_FOR_ASSERTS_ONLY;
 		Oid			oid = InvalidOid;
 		const char *nspname = NULL;
 		const char *relname = NULL;