Commit20f6d74

committed

Collect duplicate copies of oid_cmp()

1 parent788af6f commit20f6d74Copy full SHA for 20f6d74

File tree

+17

-51

lines changed

+17

-51

lines changed

Lines changed: 0 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@`
`36`	`36`	`Oidbinary_upgrade_next_pg_enum_oid=InvalidOid;`
`37`	`37`
`38`	`38`	`staticvoidRenumberEnumType(Relationpg_enum,HeapTuple*existing,intnelems);`
`39`		`-staticintoid_cmp(constvoidp1,constvoidp2);`
`40`	`39`	`staticintsort_order_cmp(constvoidp1,constvoidp2);`
`41`	`40`
`42`	`41`
`@@ -605,20 +604,6 @@ RenumberEnumType(Relation pg_enum, HeapTuple *existing, int nelems)`
`605`	`604`	`}`
`606`	`605`
`607`	`606`
`608`		`-/* qsort comparison function for oids */`
`609`		`-staticint`
`610`		`-oid_cmp(constvoidp1,constvoidp2)`
`611`		`-{`
`612`		`-Oidv1=((constOid)p1);`
`613`		`-Oidv2=((constOid)p2);`
`614`		`-`
`615`		`-if (v1<v2)`
`616`		`-return-1;`
`617`		`-if (v1>v2)`
`618`		`-return1;`
`619`		`-return0;`
`620`		`-}`
`621`		`-`
`622`	`607`	`/* qsort comparison function for tuples by sort order */`
`623`	`608`	`staticint`
`624`	`609`	`sort_order_cmp(constvoidp1,constvoidp2)`

Lines changed: 1 addition & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,11 @@`
`27`	`27`	`#include"catalog/pg_inherits_fn.h"`
`28`	`28`	`#include"parser/parse_type.h"`
`29`	`29`	`#include"storage/lmgr.h"`
	`30`	`+#include"utils/builtins.h"`
`30`	`31`	`#include"utils/fmgroids.h"`
`31`	`32`	`#include"utils/syscache.h"`
`32`	`33`	`#include"utils/tqual.h"`
`33`	`34`
`34`		`-staticintoid_cmp(constvoidp1,constvoidp2);`
`35`		`-`
`36`	`35`
`37`	`36`	`/*`
`38`	`37`	`* find_inheritance_children`
`@@ -357,18 +356,3 @@ typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId)`
`357`	`356`
`358`	`357`	`returnresult;`
`359`	`358`	`}`
`360`		`-`
`361`		`-`
`362`		`-/* qsort comparison function */`
`363`		`-staticint`
`364`		`-oid_cmp(constvoidp1,constvoidp2)`
`365`		`-{`
`366`		`-Oidv1=((constOid)p1);`
`367`		`-Oidv2=((constOid)p2);`
`368`		`-`
`369`		`-if (v1<v2)`
`370`		`-return-1;`
`371`		`-if (v1>v2)`
`372`		`-return1;`
`373`		`-return0;`
`374`		`-}`

Lines changed: 1 addition & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ static void check_circularity(const Acl old_acl, const AclItem mod_aip,`
`88`	`88`	`OidownerId);`
`89`	`89`	`staticAclrecursive_revoke(Aclacl,Oidgrantee,AclModerevoke_privs,`
`90`	`90`	`OidownerId,DropBehaviorbehavior);`
`91`		`-staticintoidComparator(constvoidarg1,constvoidarg2);`
`92`	`91`
`93`	`92`	`staticAclModeconvert_priv_string(text*priv_type_text);`
`94`	`93`	`staticAclModeconvert_any_priv_string(text*priv_type_text,`
`@@ -1490,7 +1489,7 @@ aclmembers(const Acl acl, Oid *roleids)`
`1490`	`1489`	`}`
`1491`	`1490`
`1492`	`1491`	`/* Sort the array */`
`1493`		`-qsort(list,j,sizeof(Oid),oidComparator);`
	`1492`	`+qsort(list,j,sizeof(Oid),oid_cmp);`
`1494`	`1493`
`1495`	`1494`	`/* Remove duplicates from the array */`
`1496`	`1495`	`k=0;`
`@@ -1509,23 +1508,6 @@ aclmembers(const Acl acl, Oid *roleids)`
`1509`	`1508`	`returnk+1;`
`1510`	`1509`	`}`
`1511`	`1510`
`1512`		`-/*`
`1513`		`- * oidComparator`
`1514`		`- *qsort comparison function for Oids`
`1515`		`- */`
`1516`		`-staticint`
`1517`		`-oidComparator(constvoidarg1,constvoidarg2)`
`1518`		`-{`
`1519`		`-Oidoid1=(constOid)arg1;`
`1520`		`-Oidoid2=(constOid)arg2;`
`1521`		`-`
`1522`		`-if (oid1>oid2)`
`1523`		`-return1;`
`1524`		`-if (oid1<oid2)`
`1525`		`-return-1;`
`1526`		`-return0;`
`1527`		`-}`
`1528`		`-`
`1529`	`1511`
`1530`	`1512`	`/*`
`1531`	`1513`	`* aclinsert (exported function)`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,20 @@ oidparse(Node *node)`
`331`	`331`	`returnInvalidOid;/* keep compiler quiet */`
`332`	`332`	`}`
`333`	`333`
	`334`	`+/* qsort comparison function for Oids */`
	`335`	`+int`
	`336`	`+oid_cmp(constvoidp1,constvoidp2)`
	`337`	`+{`
	`338`	`+Oidv1=((constOid)p1);`
	`339`	`+Oidv2=((constOid)p2);`
	`340`	`+`
	`341`	`+if (v1<v2)`
	`342`	`+return-1;`
	`343`	`+if (v1>v2)`
	`344`	`+return1;`
	`345`	`+return0;`
	`346`	`+}`
	`347`	`+`
`334`	`348`
`335`	`349`	`/*****************************************************************************`
`336`	`350`	`* PUBLIC ROUTINES *`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ extern intfloat8_cmp_internal(float8 a, float8 b);`
`67`	`67`	`/* oid.c */`
`68`	`68`	`externoidvectorbuildoidvector(constOidoids,intn);`
`69`	`69`	`externOidoidparse(Node*node);`
	`70`	`+externintoid_cmp(constvoidp1,constvoidp2);`
`70`	`71`
`71`	`72`	`/* regexp.c */`
`72`	`73`	`externcharregexp_fixed_prefix(texttext_re,boolcase_insensitive,`

Comments

(0)