diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2017-03-01 11:55:28 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2017-03-01 11:55:28 -0500 |
| commit | 20f6d74242b3c9c84924e890248d027d30283e21 (patch) | |
| tree | 5cc92ffb6ef7830ba9f6dbada7c109da9b07f60e /src/backend/utils/adt/acl.c | |
| parent | 788af6f8541d5f30acec540e4fd3cb24f5347209 (diff) | |
| download | postgresql-20f6d74242b3c9c84924e890248d027d30283e21.tar.gz postgresql-20f6d74242b3c9c84924e890248d027d30283e21.zip | |
Collect duplicate copies of oid_cmp()
Diffstat (limited to 'src/backend/utils/adt/acl.c')
| -rw-r--r-- | src/backend/utils/adt/acl.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 96ac1dfefd8..fca8420b016 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -88,7 +88,6 @@ static void check_circularity(const Acl *old_acl, const AclItem *mod_aip, Oid ownerId); static Acl *recursive_revoke(Acl *acl, Oid grantee, AclMode revoke_privs, Oid ownerId, DropBehavior behavior); -static int oidComparator(const void *arg1, const void *arg2); static AclMode convert_priv_string(text *priv_type_text); static AclMode convert_any_priv_string(text *priv_type_text, @@ -1490,7 +1489,7 @@ aclmembers(const Acl *acl, Oid **roleids) } /* Sort the array */ - qsort(list, j, sizeof(Oid), oidComparator); + qsort(list, j, sizeof(Oid), oid_cmp); /* Remove duplicates from the array */ k = 0; @@ -1509,23 +1508,6 @@ aclmembers(const Acl *acl, Oid **roleids) return k + 1; } -/* - * oidComparator - * qsort comparison function for Oids - */ -static int -oidComparator(const void *arg1, const void *arg2) -{ - Oid oid1 = *(const Oid *) arg1; - Oid oid2 = *(const Oid *) arg2; - - if (oid1 > oid2) - return 1; - if (oid1 < oid2) - return -1; - return 0; -} - /* * aclinsert (exported function) |