hyung-hwan/moo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

renamed some encoding conversion functions for consistency

Browse Source
This commit is contained in:
hyunghwan.chung 2018-04-06 16:33:35 +00:00
parent 454e616e70
commit 838189c438
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
moo/lib/moo-utl.h
View File

@ -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 * 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. * 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_bch_t bcs[10];
* moo_oow_t ucslen = 5; * moo_oow_t ucslen = 5;
* moo_oow_t bcslen = MOO_COUNTOF(bcs); * 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) * if (n <= -1)
* { * {
* // conversion error * // conversion error
* } * }
* \endcode * \endcode
*/ */
MOO_EXPORT int moo_convutoutf8chars ( MOO_EXPORT int moo_conv_uchars_to_utf8 (
const moo_uch_t* ucs, const moo_uch_t* ucs,
moo_oow_t* ucslen, moo_oow_t* ucslen,
moo_bch_t* bcs, 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. * 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 ucslen = MOO_COUNTOF(buf), n;
* moo_oow_t bcslen = 11; * moo_oow_t bcslen = 11;
* int n; * 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 } * if (n <= -1) { invalid/incomplenete sequence or buffer to small }
* \endcode * \endcode
* *
@ -452,7 +452,7 @@ MOO_EXPORT int moo_convutoutf8chars (
* -2 if the wide-character string buffer is too small. * -2 if the wide-character string buffer is too small.
* -3 if \a bcs is not a complete sequence. * -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, const moo_bch_t* bcs,
moo_oow_t* bcslen, moo_oow_t* bcslen,
moo_uch_t* ucs, 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, const moo_uch_t* ucs,
moo_oow_t* ucslen, moo_oow_t* ucslen,
moo_bch_t* bcs, moo_bch_t* bcs,
moo_oow_t* bcslen moo_oow_t* bcslen
); );
MOO_EXPORT int moo_convutf8toucstr ( MOO_EXPORT int moo_conv_utf8_to_ucstr (
const moo_bch_t* bcs, const moo_bch_t* bcs,
moo_oow_t* bcslen, moo_oow_t* bcslen,
moo_uch_t* ucs, 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_uch_t uc,
moo_bch_t* utf8, moo_bch_t* utf8,
moo_oow_t size 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, const moo_bch_t* utf8,
moo_oow_t size, moo_oow_t size,
moo_uch_t* uc moo_uch_t* uc

4
moo/lib/utf8.c
View File

@ -79,7 +79,7 @@ static MOO_INLINE __utf8_t* get_utf8_slot (moo_uch_t uc)
return MOO_NULL; /* invalid character */ 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); __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; 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; __utf8_t* cur, * end;

12
moo/lib/utl.c
View File

@ -687,8 +687,8 @@ MOO_INLINE int moo_conv_ucs_to_bcs_with_cmgr (
static moo_cmgr_t utf8_cmgr = static moo_cmgr_t utf8_cmgr =
{ {
moo_utf8touc, moo_utf8_to_uc,
moo_uctoutf8 moo_uc_to_utf8
}; };
moo_cmgr_t* moo_get_utf8_cmgr (void) moo_cmgr_t* moo_get_utf8_cmgr (void)
@ -696,25 +696,25 @@ moo_cmgr_t* moo_get_utf8_cmgr (void)
return &utf8_cmgr; 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 */ /* the source is length bound */
return moo_conv_bcsn_to_ucsn_with_cmgr(bcs, bcslen, ucs, ucslen, &utf8_cmgr, 0); 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 */ /* length bound */
return moo_conv_ucsn_to_bcsn_with_cmgr(ucs, ucslen, bcs, bcslen, &utf8_cmgr); 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. */ /* null-terminated. */
return moo_conv_bcs_to_ucs_with_cmgr(bcs, bcslen, ucs, ucslen, &utf8_cmgr, 0); 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 */ /* null-terminated */
return moo_conv_ucs_to_bcs_with_cmgr(ucs, ucslen, bcs, bcslen, &utf8_cmgr); return moo_conv_ucs_to_bcs_with_cmgr(ucs, ucslen, bcs, bcslen, &utf8_cmgr);