sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

dsdb:schema: use NUMERIC_CMP in place of uint32_cmp

Browse Source 
uint32_cmp (introduced in 0c362597c0f933b3612bb17328c0a13b73d72e43
"fixed the sorting of schema attributes") was doing what NUMERIC_CMP
does, but it was adding an extra function call. This results in less
code.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15625

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 8317a6173646d425dc99e08bbf3d6086b0086bc5)
This commit is contained in:
Douglas Bagnall 2024-04-07 15:36:06 +12:00 committed by Jule Anger
parent 29b17d296c
commit 835594dea0
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/dsdb/schema/schema_set.c
View File

@ -478,19 +478,13 @@ static void dsdb_setup_attribute_shortcuts(struct ldb_context *ldb, struct dsdb_
TALLOC_FREE(frame); TALLOC_FREE(frame);
} }
static int uint32_cmp(uint32_t c1, uint32_t c2)
{
if (c1 == c2) return 0;
return c1 > c2 ? 1 : -1;
}
static int dsdb_compare_class_by_lDAPDisplayName(struct dsdb_class **c1, struct dsdb_class **c2) static int dsdb_compare_class_by_lDAPDisplayName(struct dsdb_class **c1, struct dsdb_class **c2)
{ {
return strcasecmp((*c1)->lDAPDisplayName, (*c2)->lDAPDisplayName); return strcasecmp((*c1)->lDAPDisplayName, (*c2)->lDAPDisplayName);
} }
static int dsdb_compare_class_by_governsID_id(struct dsdb_class **c1, struct dsdb_class **c2) static int dsdb_compare_class_by_governsID_id(struct dsdb_class **c1, struct dsdb_class **c2)
{ {
return uint32_cmp((*c1)->governsID_id, (*c2)->governsID_id); return NUMERIC_CMP((*c1)->governsID_id, (*c2)->governsID_id);
} }
static int dsdb_compare_class_by_governsID_oid(struct dsdb_class **c1, struct dsdb_class **c2) static int dsdb_compare_class_by_governsID_oid(struct dsdb_class **c1, struct dsdb_class **c2)
{ {
@ -507,11 +501,11 @@ static int dsdb_compare_attribute_by_lDAPDisplayName(struct dsdb_attribute **a1,
} }
static int dsdb_compare_attribute_by_attributeID_id(struct dsdb_attribute **a1, struct dsdb_attribute **a2) static int dsdb_compare_attribute_by_attributeID_id(struct dsdb_attribute **a1, struct dsdb_attribute **a2)
{ {
return uint32_cmp((*a1)->attributeID_id, (*a2)->attributeID_id); return NUMERIC_CMP((*a1)->attributeID_id, (*a2)->attributeID_id);
} }
static int dsdb_compare_attribute_by_msDS_IntId(struct dsdb_attribute **a1, struct dsdb_attribute **a2) static int dsdb_compare_attribute_by_msDS_IntId(struct dsdb_attribute **a1, struct dsdb_attribute **a2)
{ {
return uint32_cmp((*a1)->msDS_IntId, (*a2)->msDS_IntId); return NUMERIC_CMP((*a1)->msDS_IntId, (*a2)->msDS_IntId);
} }
static int dsdb_compare_attribute_by_attributeID_oid(struct dsdb_attribute **a1, struct dsdb_attribute **a2) static int dsdb_compare_attribute_by_attributeID_oid(struct dsdb_attribute **a1, struct dsdb_attribute **a2)
{ {
@ -519,7 +513,7 @@ static int dsdb_compare_attribute_by_attributeID_oid(struct dsdb_attribute **a1,
} }
static int dsdb_compare_attribute_by_linkID(struct dsdb_attribute **a1, struct dsdb_attribute **a2) static int dsdb_compare_attribute_by_linkID(struct dsdb_attribute **a1, struct dsdb_attribute **a2)
{ {
return uint32_cmp((*a1)->linkID, (*a2)->linkID); return NUMERIC_CMP((*a1)->linkID, (*a2)->linkID);
} }
static int dsdb_compare_attribute_by_cn(struct dsdb_attribute **a1, struct dsdb_attribute **a2) static int dsdb_compare_attribute_by_cn(struct dsdb_attribute **a1, struct dsdb_attribute **a2)
{ {