From 70d0d751d147cd0a4f3d565622b889c211bbe917 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Apr 2009 13:03:09 +0200 Subject: [PATCH] Use the new u*_cmp2 functions. --- ChangeLog | 14 ++++++++++++++ lib/unicase.h | 2 +- lib/unicase/u-casecmp.h | 11 ++--------- lib/unicase/u16-casecmp.c | 2 +- lib/unicase/u32-casecmp.c | 2 +- lib/unicase/u8-casecmp.c | 2 +- lib/unicase/ulc-casecmp.c | 2 +- modules/unicase/u16-casecmp | 2 +- modules/unicase/u32-casecmp | 2 +- modules/unicase/u8-casecmp | 2 +- modules/unicase/ulc-casecmp | 2 +- 11 files changed, 25 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1286d87ca..786634f8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2009-04-05 Bruno Haible + * lib/unicase.h: Mention u*_cmp2. + * lib/unicase/u-casecmp.h (FUNC): Invoke U_CMP2 instead of U_CMP. + * lib/unicase/u8-casecmp.c: Use u8_cmp2 instead of u8_cmp. + * lib/unicase/ulc-casecmp.c: Likewise. + * lib/unicase/u16-casecmp.c: Use u16_cmp2 instead of u16_cmp. + * lib/unicase/u32-casecmp.c: Use u32_cmp2 instead of u32_cmp. + * modules/unicase/u8-casecmp (Depends-on): Add unistr/u8-cmp2, remove + unistr/u8-cmp. + * modules/unicase/ulc-casecmp (Depends-on): Likewise. + * modules/unicase/u16-casecmp (Depends-on): Add unistr/u16-cmp2, remove + unistr/u16-cmp. + * modules/unicase/u32-casecmp (Depends-on): Add unistr/u32-cmp2, remove + unistr/u32-cmp. + * lib/uninorm.h: Mention u*_cmp2. * lib/uninorm/u-normcmp.h (FUNC): Invoke U_CMP2 instead of U_CMP. * lib/uninorm/u8-normcmp.c: Use u8_cmp2 instead of u8_cmp. diff --git a/lib/unicase.h b/lib/unicase.h index 9f37a6b83..73d2c07af 100644 --- a/lib/unicase.h +++ b/lib/unicase.h @@ -173,7 +173,7 @@ extern int const char *iso639_language, uninorm_t nf, int *resultp); /* Converts the string S of length N to a string in locale encoding, in such a - way that comparing uN_casexfrm (S1) and uN_casexfrm (S2) with memcmp2() is + way that comparing uN_casexfrm (S1) and uN_casexfrm (S2) with uN_cmp2() is equivalent to comparing S1 and S2 with uN_casecoll(). NF must be either UNINORM_NFC, UNINORM_NFKC, or NULL for no normalization. */ extern char * diff --git a/lib/unicase/u-casecmp.h b/lib/unicase/u-casecmp.h index 8ae23d703..e1cf99c46 100644 --- a/lib/unicase/u-casecmp.h +++ b/lib/unicase/u-casecmp.h @@ -54,15 +54,8 @@ FUNC (const SRC_UNIT *s1, size_t n1, const SRC_UNIT *s2, size_t n2, } /* Compare the normalized strings. */ - cmp = U_CMP (norms1, norms2, MIN (norms1_length, norms2_length)); - if (cmp == 0) - { - if (norms1_length < norms2_length) - cmp = -1; - else if (norms1_length > norms2_length) - cmp = 1; - } - else if (cmp > 0) + cmp = U_CMP2 (norms1, norms1_length, norms2, norms2_length); + if (cmp > 0) cmp = 1; else if (cmp < 0) cmp = -1; diff --git a/lib/unicase/u16-casecmp.c b/lib/unicase/u16-casecmp.c index b4777f54e..1110874ec 100644 --- a/lib/unicase/u16-casecmp.c +++ b/lib/unicase/u16-casecmp.c @@ -31,5 +31,5 @@ #define UNIT uint16_t #define SRC_UNIT uint16_t #define U_CASEFOLD u16_casefold -#define U_CMP u16_cmp +#define U_CMP2 u16_cmp2 #include "u-casecmp.h" diff --git a/lib/unicase/u32-casecmp.c b/lib/unicase/u32-casecmp.c index a691c43d3..e964915f3 100644 --- a/lib/unicase/u32-casecmp.c +++ b/lib/unicase/u32-casecmp.c @@ -31,5 +31,5 @@ #define UNIT uint32_t #define SRC_UNIT uint32_t #define U_CASEFOLD u32_casefold -#define U_CMP u32_cmp +#define U_CMP2 u32_cmp2 #include "u-casecmp.h" diff --git a/lib/unicase/u8-casecmp.c b/lib/unicase/u8-casecmp.c index b7e250af2..4a55de911 100644 --- a/lib/unicase/u8-casecmp.c +++ b/lib/unicase/u8-casecmp.c @@ -31,5 +31,5 @@ #define UNIT uint8_t #define SRC_UNIT uint8_t #define U_CASEFOLD u8_casefold -#define U_CMP u8_cmp +#define U_CMP2 u8_cmp2 #include "u-casecmp.h" diff --git a/lib/unicase/ulc-casecmp.c b/lib/unicase/ulc-casecmp.c index b337ee2f6..c061b2465 100644 --- a/lib/unicase/ulc-casecmp.c +++ b/lib/unicase/ulc-casecmp.c @@ -69,5 +69,5 @@ ulc_u8_casefold (const char *s, size_t n, const char *iso639_language, #define UNIT uint8_t #define SRC_UNIT char #define U_CASEFOLD ulc_u8_casefold -#define U_CMP u8_cmp +#define U_CMP2 u8_cmp2 #include "u-casecmp.h" diff --git a/modules/unicase/u16-casecmp b/modules/unicase/u16-casecmp index a2d7ee0ae..ec5a60b22 100644 --- a/modules/unicase/u16-casecmp +++ b/modules/unicase/u16-casecmp @@ -9,7 +9,7 @@ Depends-on: unicase/base unicase/u16-casefold uninorm/decomposing-form -unistr/u16-cmp +unistr/u16-cmp2 minmax configure.ac: diff --git a/modules/unicase/u32-casecmp b/modules/unicase/u32-casecmp index 21b5bcf72..9c0ce1d25 100644 --- a/modules/unicase/u32-casecmp +++ b/modules/unicase/u32-casecmp @@ -9,7 +9,7 @@ Depends-on: unicase/base unicase/u32-casefold uninorm/decomposing-form -unistr/u32-cmp +unistr/u32-cmp2 minmax configure.ac: diff --git a/modules/unicase/u8-casecmp b/modules/unicase/u8-casecmp index 521ccdc5a..b4fdba87c 100644 --- a/modules/unicase/u8-casecmp +++ b/modules/unicase/u8-casecmp @@ -9,7 +9,7 @@ Depends-on: unicase/base unicase/u8-casefold uninorm/decomposing-form -unistr/u8-cmp +unistr/u8-cmp2 minmax configure.ac: diff --git a/modules/unicase/ulc-casecmp b/modules/unicase/ulc-casecmp index 618ae286e..ad1b96de8 100644 --- a/modules/unicase/ulc-casecmp +++ b/modules/unicase/ulc-casecmp @@ -10,7 +10,7 @@ unicase/base unicase/u8-casefold uninorm/decomposing-form uniconv/u8-conv-from-enc -unistr/u8-cmp +unistr/u8-cmp2 localcharset minmax -- 2.11.0