mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-15 08:20:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename pg_shdepend.c's typedef "objectType" to SharedDependencyObjectType.

Browse Source 
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.
This commit is contained in:
Tom Lane 2015-05-24 13:03:45 -04:00
parent 4dddf85528
commit 991dee2e60
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/catalog/pg_shdepend.c
View File

@ -58,7 +58,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);
@ -75,7 +75,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);
@ -1053,7 +1054,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)