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 | 20bc3548d77a30eeae37e3cc86088fc52059ca4a (patch) | |
| tree | bc93c43a3f95e09f6edf364ab330ebc340ca7693 | |
| parent | 9b74f32cdbff8b9be47fc69164eae552050509ff (diff) | |
| download | postgresql-20bc3548d77a30eeae37e3cc86088fc52059ca4a.tar.gz postgresql-20bc3548d77a30eeae37e3cc86088fc52059ca4a.zip | |
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.
| -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 5d41ae4a487..15fda719911 100644 --- a/src/backend/catalog/pg_shdepend.c +++ b/src/backend/catalog/pg_shdepend.c @@ -67,7 +67,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); @@ -84,7 +84,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); @@ -1062,7 +1063,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) |