mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-06 10:46:21 +08:00
use ber_bvcmp() whenever possible
This commit is contained in:
parent
e847d6fdf2
commit
7b2f5f0da7
@ -51,12 +51,10 @@ monitor_cache_cmp(
|
|||||||
struct monitorcache *cc1 = ( struct monitorcache * )c1;
|
struct monitorcache *cc1 = ( struct monitorcache * )c1;
|
||||||
struct monitorcache *cc2 = ( struct monitorcache * )c2;
|
struct monitorcache *cc2 = ( struct monitorcache * )c2;
|
||||||
|
|
||||||
int d = cc1->mc_ndn->bv_len - cc2->mc_ndn->bv_len;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* case sensitive, because the dn MUST be normalized
|
* case sensitive, because the dn MUST be normalized
|
||||||
*/
|
*/
|
||||||
return d != 0 ? d : strcmp( cc1->mc_ndn->bv_val, cc2->mc_ndn->bv_val );
|
return ber_bvcmp( cc1->mc_ndn, cc2->mc_ndn );
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -71,19 +69,10 @@ monitor_cache_dup(
|
|||||||
struct monitorcache *cc1 = ( struct monitorcache * )c1;
|
struct monitorcache *cc1 = ( struct monitorcache * )c1;
|
||||||
struct monitorcache *cc2 = ( struct monitorcache * )c2;
|
struct monitorcache *cc2 = ( struct monitorcache * )c2;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* case sensitive, because the dn MUST be normalized
|
* case sensitive, because the dn MUST be normalized
|
||||||
*/
|
*/
|
||||||
#if 0
|
return ber_bvcmp( cc1->mc_ndn, cc2->mc_ndn ) == 0 ? -1 : 0;
|
||||||
int cmp = monitor_cache_cmp( c1, c2 );
|
|
||||||
#else
|
|
||||||
int d = cc1->mc_ndn->bv_len - cc2->mc_ndn->bv_len;
|
|
||||||
int cmp =
|
|
||||||
d != 0 ? d : strcmp( cc1->mc_ndn->bv_val, cc2->mc_ndn->bv_val );
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return cmp == 0 ? -1 : 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user