Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 20bc354

Browse files
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 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.
1 parent 9b74f32 commit 20bc354

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/backend/catalog/pg_shdepend.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ typedef enum
6767
LOCAL_OBJECT,
6868
SHARED_OBJECT,
6969
REMOTE_OBJECT
70-
} objectType;
70+
} SharedDependencyObjectType;
7171

7272
static void getOidListDiff(Oid *list1, int *nlist1, Oid *list2, int *nlist2);
7373
static Oid classIdGetDbId(Oid classId);
@@ -84,7 +84,8 @@ static void shdepDropDependency(Relation sdepRel,
8484
bool drop_subobjects,
8585
Oid refclassId, Oid refobjId,
8686
SharedDependencyType deptype);
87-
static void storeObjectDescription(StringInfo descs, objectType type,
87+
static void storeObjectDescription(StringInfo descs,
88+
SharedDependencyObjectType type,
8889
ObjectAddress *object,
8990
SharedDependencyType deptype,
9091
int count);
@@ -1062,7 +1063,8 @@ shdepLockAndCheckObject(Oid classId, Oid objectId)
10621063
* and count to be nonzero; deptype is not used in this case.
10631064
*/
10641065
static void
1065-
storeObjectDescription(StringInfo descs, objectType type,
1066+
storeObjectDescription(StringInfo descs,
1067+
SharedDependencyObjectType type,
10661068
ObjectAddress *object,
10671069
SharedDependencyType deptype,
10681070
int count)

0 commit comments

Comments
 (0)