diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-05-20 13:03:08 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-05-20 13:03:08 -0400 |
| commit | 9dc76f032cd6a1fbde760aa9c264057fec7b1855 (patch) | |
| tree | baece5f862584662b3b5af26f0fff80463c6a660 | |
| parent | 010429eb1f77a6221f6c89b21b6b0c7820446201 (diff) | |
| download | postgresql-9dc76f032cd6a1fbde760aa9c264057fec7b1855.tar.gz postgresql-9dc76f032cd6a1fbde760aa9c264057fec7b1855.zip | |
Clean up cpluspluscheck violation.
"typename" is a C++ keyword, so pg_upgrade.h fails to compile in C++.
Fortunately, there seems no likely reason for somebody to need to
do that. Nonetheless, it's project policy that all .h files should
pass cpluspluscheck, so rename the argument to fix that.
Oversight in 57c081de0; back-patch as that was. (The policy requiring
pg_upgrade.h to pass cpluspluscheck only goes back to v12, but it
seems best to keep this code looking the same in all branches.)
| -rw-r--r-- | src/bin/pg_upgrade/pg_upgrade.h | 2 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/version.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h index 34fd1c05fa3..dbdf4d4a551 100644 --- a/src/bin/pg_upgrade/pg_upgrade.h +++ b/src/bin/pg_upgrade/pg_upgrade.h @@ -446,7 +446,7 @@ bool check_for_data_types_usage(ClusterInfo *cluster, const char *base_query, const char *output_path); bool check_for_data_type_usage(ClusterInfo *cluster, - const char *typename, + const char *type_name, const char *output_path); void new_9_0_populate_pg_largeobject_metadata(ClusterInfo *cluster, bool check_mode); diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c index 16e2afe8668..bda11664c5a 100644 --- a/src/bin/pg_upgrade/version.c +++ b/src/bin/pg_upgrade/version.c @@ -233,20 +233,20 @@ check_for_data_types_usage(ClusterInfo *cluster, * * If so, write a report to the given file name, and return true. * - * typename should be a fully qualified type name. This is just a + * type_name should be a fully qualified type name. This is just a * trivial wrapper around check_for_data_types_usage() to convert a * type name into a base query. */ bool check_for_data_type_usage(ClusterInfo *cluster, - const char *typename, + const char *type_name, const char *output_path) { bool found; char *base_query; base_query = psprintf("SELECT '%s'::pg_catalog.regtype AS oid", - typename); + type_name); found = check_for_data_types_usage(cluster, base_query, output_path); |