NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2e4c501

committed

Rename pg_shdepend.c's typedef "objectType" to SharedDependencyObjectType.

The name objectType is widely used as a field name, and it's pure luck thatthis conflict has not caused pgindent to go crazy before. It messed uppg_audit.c pretty good though. Since pg_shdepend.c doesn't export thistypedef and only uses it in three places, changing that seems saner thanchanging the field usages.Back-patch because we're contemplating using the union of all branchtypedefs for future pgindent runs, so this won't fix anything if itstays the same in back branches.

1 parent2c2c5f0 commit2e4c501Copy full SHA for 2e4c501

File tree

1 file changed

-3

lines changed

src/backend/catalog
- pg_shdepend.c

1 file changed

-3

lines changed

`‎src/backend/catalog/pg_shdepend.c`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ typedef enum`
`62`	`62`	`LOCAL_OBJECT,`
`63`	`63`	`SHARED_OBJECT,`
`64`	`64`	`REMOTE_OBJECT`
`65`		`-}objectType;`
	`65`	`+}SharedDependencyObjectType;`
`66`	`66`
`67`	`67`	`staticvoidgetOidListDiff(Oidlist1,intnlist1,Oidlist2,intnlist2);`
`68`	`68`	`staticOidclassIdGetDbId(OidclassId);`
`@@ -79,7 +79,8 @@ static void shdepDropDependency(Relation sdepRel,`
`79`	`79`	`booldrop_subobjects,`
`80`	`80`	`OidrefclassId,OidrefobjId,`
`81`	`81`	`SharedDependencyTypedeptype);`
`82`		`-staticvoidstoreObjectDescription(StringInfodescs,objectTypetype,`
	`82`	`+staticvoidstoreObjectDescription(StringInfodescs,`
	`83`	`+SharedDependencyObjectTypetype,`
`83`	`84`	`ObjectAddress*object,`
`84`	`85`	`SharedDependencyTypedeptype,`
`85`	`86`	`intcount);`
`@@ -1057,7 +1058,8 @@ shdepLockAndCheckObject(Oid classId, Oid objectId)`
`1057`	`1058`	`* and count to be nonzero; deptype is not used in this case.`
`1058`	`1059`	`*/`
`1059`	`1060`	`staticvoid`
`1060`		`-storeObjectDescription(StringInfodescs,objectTypetype,`
	`1061`	`+storeObjectDescription(StringInfodescs,`
	`1062`	`+SharedDependencyObjectTypetype,`
`1061`	`1063`	`ObjectAddress*object,`
`1062`	`1064`	`SharedDependencyTypedeptype,`
`1063`	`1065`	`intcount)`

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!

Commit2e4c501

File tree

1 file changed

1 file changed

`‎src/backend/catalog/pg_shdepend.c`

0 commit comments