From 838189c43857e14bc799093bbcad59a123dbbc35 Mon Sep 17 00:00:00 2001 From: "hyunghwan.chung" Date: Fri, 6 Apr 2018 16:33:35 +0000 Subject: [PATCH] renamed some encoding conversion functions for consistency --- moo/lib/moo-utl.h | 20 ++++++++++---------- moo/lib/utf8.c | 4 ++-- moo/lib/utl.c | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/moo/lib/moo-utl.h b/moo/lib/moo-utl.h index 6aee3bc..26d4bf9 100644 --- a/moo/lib/moo-utl.h +++ b/moo/lib/moo-utl.h @@ -393,7 +393,7 @@ MOO_EXPORT moo_cmgr_t* moo_get_utf8_cmgr ( ); /** - * The moo_convutoutf8chars() function converts a unicode character string \a ucs + * The moo_conv_uchars_to_utf8() function converts a unicode character string \a ucs * to a UTF8 string and writes it into the buffer pointed to by \a bcs, but * not more than \a bcslen bytes including the terminating null. * @@ -414,14 +414,14 @@ MOO_EXPORT moo_cmgr_t* moo_get_utf8_cmgr ( * moo_bch_t bcs[10]; * moo_oow_t ucslen = 5; * moo_oow_t bcslen = MOO_COUNTOF(bcs); - * n = moo_convutoutf8chars (ucs, &ucslen, bcs, &bcslen); + * n = moo_conv_uchars_to_utf8 (ucs, &ucslen, bcs, &bcslen); * if (n <= -1) * { * // conversion error * } * \endcode */ -MOO_EXPORT int moo_convutoutf8chars ( +MOO_EXPORT int moo_conv_uchars_to_utf8 ( const moo_uch_t* ucs, moo_oow_t* ucslen, moo_bch_t* bcs, @@ -429,7 +429,7 @@ MOO_EXPORT int moo_convutoutf8chars ( ); /** - * The moo_convutf8touchars() function converts a UTF8 string to a uncide string. + * The moo_conv_utf8_to_uchars() function converts a UTF8 string to a uncide string. * * It never returns -2 if \a ucs is #MOO_NULL. * @@ -439,7 +439,7 @@ MOO_EXPORT int moo_convutoutf8chars ( * moo_oow_t ucslen = MOO_COUNTOF(buf), n; * moo_oow_t bcslen = 11; * int n; - * n = moo_convutf8touchars (bcs, &bcslen, ucs, &ucslen); + * n = moo_conv_utf8_to_uchars (bcs, &bcslen, ucs, &ucslen); * if (n <= -1) { invalid/incomplenete sequence or buffer to small } * \endcode * @@ -452,7 +452,7 @@ MOO_EXPORT int moo_convutoutf8chars ( * -2 if the wide-character string buffer is too small. * -3 if \a bcs is not a complete sequence. */ -MOO_EXPORT int moo_convutf8touchars ( +MOO_EXPORT int moo_conv_utf8_to_uchars ( const moo_bch_t* bcs, moo_oow_t* bcslen, moo_uch_t* ucs, @@ -460,14 +460,14 @@ MOO_EXPORT int moo_convutf8touchars ( ); -MOO_EXPORT int moo_convutoutf8cstr ( +MOO_EXPORT int moo_conv_ucstr_to_utf8 ( const moo_uch_t* ucs, moo_oow_t* ucslen, moo_bch_t* bcs, moo_oow_t* bcslen ); -MOO_EXPORT int moo_convutf8toucstr ( +MOO_EXPORT int moo_conv_utf8_to_ucstr ( const moo_bch_t* bcs, moo_oow_t* bcslen, moo_uch_t* ucs, @@ -475,13 +475,13 @@ MOO_EXPORT int moo_convutf8toucstr ( ); -MOO_EXPORT moo_oow_t moo_uctoutf8 ( +MOO_EXPORT moo_oow_t moo_uc_to_utf8 ( moo_uch_t uc, moo_bch_t* utf8, moo_oow_t size ); -MOO_EXPORT moo_oow_t moo_utf8touc ( +MOO_EXPORT moo_oow_t moo_utf8_to_uc ( const moo_bch_t* utf8, moo_oow_t size, moo_uch_t* uc diff --git a/moo/lib/utf8.c b/moo/lib/utf8.c index f962e8a..87c2796 100644 --- a/moo/lib/utf8.c +++ b/moo/lib/utf8.c @@ -79,7 +79,7 @@ static MOO_INLINE __utf8_t* get_utf8_slot (moo_uch_t uc) return MOO_NULL; /* invalid character */ } -moo_oow_t moo_uctoutf8 (moo_uch_t uc, moo_bch_t* utf8, moo_oow_t size) +moo_oow_t moo_uc_to_utf8 (moo_uch_t uc, moo_bch_t* utf8, moo_oow_t size) { __utf8_t* cur = get_utf8_slot (uc); @@ -106,7 +106,7 @@ moo_oow_t moo_uctoutf8 (moo_uch_t uc, moo_bch_t* utf8, moo_oow_t size) return (moo_oow_t)cur->length; } -moo_oow_t moo_utf8touc (const moo_bch_t* utf8, moo_oow_t size, moo_uch_t* uc) +moo_oow_t moo_utf8_to_uc (const moo_bch_t* utf8, moo_oow_t size, moo_uch_t* uc) { __utf8_t* cur, * end; diff --git a/moo/lib/utl.c b/moo/lib/utl.c index 3647199..4a11811 100644 --- a/moo/lib/utl.c +++ b/moo/lib/utl.c @@ -687,8 +687,8 @@ MOO_INLINE int moo_conv_ucs_to_bcs_with_cmgr ( static moo_cmgr_t utf8_cmgr = { - moo_utf8touc, - moo_uctoutf8 + moo_utf8_to_uc, + moo_uc_to_utf8 }; moo_cmgr_t* moo_get_utf8_cmgr (void) @@ -696,25 +696,25 @@ moo_cmgr_t* moo_get_utf8_cmgr (void) return &utf8_cmgr; } -int moo_convutf8touchars (const moo_bch_t* bcs, moo_oow_t* bcslen, moo_uch_t* ucs, moo_oow_t* ucslen) +int moo_conv_utf8_to_uchars (const moo_bch_t* bcs, moo_oow_t* bcslen, moo_uch_t* ucs, moo_oow_t* ucslen) { /* the source is length bound */ return moo_conv_bcsn_to_ucsn_with_cmgr(bcs, bcslen, ucs, ucslen, &utf8_cmgr, 0); } -int moo_convutoutf8chars (const moo_uch_t* ucs, moo_oow_t* ucslen, moo_bch_t* bcs, moo_oow_t* bcslen) +int moo_conv_uchars_to_utf8 (const moo_uch_t* ucs, moo_oow_t* ucslen, moo_bch_t* bcs, moo_oow_t* bcslen) { /* length bound */ return moo_conv_ucsn_to_bcsn_with_cmgr(ucs, ucslen, bcs, bcslen, &utf8_cmgr); } -int moo_convutf8toucstr (const moo_bch_t* bcs, moo_oow_t* bcslen, moo_uch_t* ucs, moo_oow_t* ucslen) +int moo_conv_utf8_to_ucstr (const moo_bch_t* bcs, moo_oow_t* bcslen, moo_uch_t* ucs, moo_oow_t* ucslen) { /* null-terminated. */ return moo_conv_bcs_to_ucs_with_cmgr(bcs, bcslen, ucs, ucslen, &utf8_cmgr, 0); } -int moo_convutoutf8cstr (const moo_uch_t* ucs, moo_oow_t* ucslen, moo_bch_t* bcs, moo_oow_t* bcslen) +int moo_conv_ucstr_to_utf8 (const moo_uch_t* ucs, moo_oow_t* ucslen, moo_bch_t* bcs, moo_oow_t* bcslen) { /* null-terminated */ return moo_conv_ucs_to_bcs_with_cmgr(ucs, ucslen, bcs, bcslen, &utf8_cmgr);