X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=ucw%2Fff-unicode.h;h=44593440e229e2a54db8961339c6b068590073df;hb=25541ea3bb96e9f143f0e23f8ac5b432f2f6f47a;hp=58c75d8581e135168264648cebc7be9f98ad22f1;hpb=031256ad2e123eec58521f8e3eb9496c197641d2;p=libucw.git diff --git a/ucw/ff-unicode.h b/ucw/ff-unicode.h index 58c75d85..44593440 100644 --- a/ucw/ff-unicode.h +++ b/ucw/ff-unicode.h @@ -15,7 +15,7 @@ #include "ucw/fastbuf.h" #include "ucw/unicode.h" -/*** UTF-8 ***/ +/* ** UTF-8 ** */ int bget_utf8_slow(struct fastbuf *b, uns repl); int bget_utf8_32_slow(struct fastbuf *b, uns repl); @@ -48,20 +48,17 @@ bget_utf8_32_repl(struct fastbuf *b, uns repl) return bget_utf8_32_slow(b, repl); } -static inline int -bget_utf8(struct fastbuf *b) +static inline int bget_utf8(struct fastbuf *b) /** Read a single utf8 character from range [0, 0xffff]. **/ { return bget_utf8_repl(b, UNI_REPLACEMENT); } -static inline int -bget_utf8_32(struct fastbuf *b) +static inline int bget_utf8_32(struct fastbuf *b) /** Read a single utf8 character (from the whole unicode range). **/ { return bget_utf8_32_repl(b, UNI_REPLACEMENT); } -static inline void -bput_utf8(struct fastbuf *b, uns u) +static inline void bput_utf8(struct fastbuf *b, uns u) /** Write a single utf8 character from range [0, 0xffff]. **/ { if (bavailw(b) >= 3) b->bptr = utf8_put(b->bptr, u); @@ -69,8 +66,7 @@ bput_utf8(struct fastbuf *b, uns u) bput_utf8_slow(b, u); } -static inline void -bput_utf8_32(struct fastbuf *b, uns u) +static inline void bput_utf8_32(struct fastbuf *b, uns u) /** Write a single utf8 character (from the whole unicode range). **/ { if (bavailw(b) >= 6) b->bptr = utf8_32_put(b->bptr, u); @@ -78,7 +74,7 @@ bput_utf8_32(struct fastbuf *b, uns u) bput_utf8_32_slow(b, u); } -/*** UTF-16 ***/ +/* ** UTF-16 ** */ int bget_utf16_be_slow(struct fastbuf *b, uns repl); int bget_utf16_le_slow(struct fastbuf *b, uns repl); @@ -111,20 +107,29 @@ bget_utf16_le_repl(struct fastbuf *b, uns repl) return bget_utf16_le_slow(b, repl); } -static inline int -bget_utf16_be(struct fastbuf *b) +/** + * Read an utf16 character from fastbuf. + * Big endian version. + **/ +static inline int bget_utf16_be(struct fastbuf *b) { return bget_utf16_be_repl(b, UNI_REPLACEMENT); } -static inline int -bget_utf16_le(struct fastbuf *b) +/** + * Read an utf16 character from fastbuf. + * Little endian version. + **/ +static inline int bget_utf16_le(struct fastbuf *b) { return bget_utf16_le_repl(b, UNI_REPLACEMENT); } -static inline void -bput_utf16_be(struct fastbuf *b, uns u) +/** + * Write an utf16 character to fastbuf. + * Big endian version. + **/ +static inline void bput_utf16_be(struct fastbuf *b, uns u) { if (bavailw(b) >= 4) b->bptr = utf16_be_put(b->bptr, u); @@ -132,8 +137,11 @@ bput_utf16_be(struct fastbuf *b, uns u) bput_utf16_be_slow(b, u); } -static inline void -bput_utf16_lbe(struct fastbuf *b, uns u) +/** + * Write an utf16 character to fastbuf. + * Little endian version. + **/ +static inline void bput_utf16_le(struct fastbuf *b, uns u) { if (bavailw(b) >= 4) b->bptr = utf16_le_put(b->bptr, u);