postgres.git / summary / log / commit / refs

commit    887e4b79f09a01f79ce2bbd0fb5846a316328a3f
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sun May 24 17:03:45 2015 +0000
First released in: 9.5.0, 9.0.21, 9.1.17, 9.2.12, 9.3.8, 9.4.3

    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.


 src/backend/catalog/pg_shdepend.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index 5bed2dfd836..1c238e5392e 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)


[parent: c6b7b9a9cef1]