]> granicus.if.org Git - postgresql/commitdiff
Rename pg_shdepend.c's typedef "objectType" to SharedDependencyObjectType.
authorTom Lane <tgl@sss.pgh.pa.us>
Sun, 24 May 2015 17:03:45 +0000 (13:03 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Sun, 24 May 2015 17:03:45 +0000 (13:03 -0400)
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

index 6ddb87bf003b5ed2ecc4cd430aabbdf119384516..34fe4e2474585a725241cf57560ec807459f4bd3 100644 (file)
@@ -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)