diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-05-24 13:03:45 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-05-24 13:03:45 -0400 |
| commit | 2e4c50137a6f96f84d804b41b355e125979e5494 (patch) | |
| tree | e7dc803f8bd6c4b5f5e6cabbc2302dde1d2db127 /src | |
| parent | 2c2c5f0e02b58d225385f5008fb797a90935cb06 (diff) | |
Rename pg_shdepend.c's typedef "objectType" to SharedDependencyObjectType.
The name objectType is widely used as a field name, and it's pure luck that
this conflict has not caused pgindent to go crazy before. It messed up
pg_audit.c pretty good though. Since pg_shdepend.c doesn't export this
typedef and only uses it in three places, changing that seems saner than
changing the field usages.
Back-patch because we're contemplating using the union of all branch
typedefs for future pgindent runs, so this won't fix anything if it
stays the same in back branches.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/pg_shdepend.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c index 2df46fa89f8..60145ce80d1 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -62,7 +62,7 @@ typedef enum LOCAL_OBJECT, SHARED_OBJECT, REMOTE_OBJECT -} objectType; +} SharedDependencyObjectType; static void getOidListDiff(Oid *list1, int *nlist1, Oid *list2, int *nlist2); static Oid classIdGetDbId(Oid classId); @@ -79,7 +79,8 @@ static void shdepDropDependency(Relation sdepRel, bool drop_subobjects, Oid refclassId, Oid refobjId, SharedDependencyType deptype); -static void storeObjectDescription(StringInfo descs, objectType type, +static void storeObjectDescription(StringInfo descs, + SharedDependencyObjectType type, ObjectAddress *object, SharedDependencyType deptype, int count); @@ -1057,7 +1058,8 @@ shdepLockAndCheckObject(Oid classId, Oid objectId) * and count to be nonzero; deptype is not used in this case. */ static void -storeObjectDescription(StringInfo descs, objectType type, +storeObjectDescription(StringInfo descs, + SharedDependencyObjectType type, ObjectAddress *object, SharedDependencyType deptype, int count) |