NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6d59a21

committed

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 todo that. Nonetheless, it's project policy that all .h files shouldpass cpluspluscheck, so rename the argument to fix that.Oversight in57c081d; back-patch as that was. (The policy requiringpg_upgrade.h to pass cpluspluscheck only goes back to v12, but itseems best to keep this code looking the same in all branches.)

1 parent8bdd6f5 commit6d59a21Copy full SHA for 6d59a21

File tree

2 files changed

-4

lines changed

src/bin/pg_upgrade
- pg_upgrade.h
- version.c

2 files changed

-4

lines changed

`‎src/bin/pg_upgrade/pg_upgrade.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ boolcheck_for_data_types_usage(ClusterInfo *cluster,`
`443`	`443`	`constchar*base_query,`
`444`	`444`	`constchar*output_path);`
`445`	`445`	`boolcheck_for_data_type_usage(ClusterInfo*cluster,`
`446`		`-constchar*typename,`
	`446`	`+constchar*type_name,`
`447`	`447`	`constchar*output_path);`
`448`	`448`	`voidnew_9_0_populate_pg_largeobject_metadata(ClusterInfo*cluster,`
`449`	`449`	`boolcheck_mode);`

`‎src/bin/pg_upgrade/version.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -233,20 +233,20 @@ check_for_data_types_usage(ClusterInfo *cluster,`
`233`	`233`	`*`
`234`	`234`	`* If so, write a report to the given file name, and return true.`
`235`	`235`	`*`
`236`		`- *typename should be a fully qualified type name. This is just a`
	`236`	`+ *type_name should be a fully qualified type name. This is just a`
`237`	`237`	`* trivial wrapper around check_for_data_types_usage() to convert a`
`238`	`238`	`* type name into a base query.`
`239`	`239`	`*/`
`240`	`240`	`bool`
`241`	`241`	`check_for_data_type_usage(ClusterInfo*cluster,`
`242`		`-constchar*typename,`
	`242`	`+constchar*type_name,`
`243`	`243`	`constchar*output_path)`
`244`	`244`	`{`
`245`	`245`	`boolfound;`
`246`	`246`	`char*base_query;`
`247`	`247`
`248`	`248`	`base_query=psprintf("SELECT '%s'::pg_catalog.regtype AS oid",`
`249`		`-typename);`
	`249`	`+type_name);`
`250`	`250`
`251`	`251`	`found=check_for_data_types_usage(cluster,base_query,output_path);`
`252`	`252`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6d59a21

File tree

2 files changed

2 files changed

`‎src/bin/pg_upgrade/pg_upgrade.h`

`‎src/bin/pg_upgrade/version.c`

0 commit comments