rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-06 00:06:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Clean up cpluspluscheck violation.

Browse Source 
"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.)
This commit is contained in:
Tom Lane 2021-05-20 13:03:09 -04:00
parent a399755ba2
commit 04959a648b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_upgrade/pg_upgrade.h
View File

@ -445,7 +445,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);

6
src/bin/pg_upgrade/version.c
View File

@ -236,20 +236,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);