X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fff-utf8.h;h=dd86ba6504227aabc432c908ff8e9d30615597da;hb=c70b0bd774606177c893f6869ece09d0fd1d9034;hp=296fb9d74d5dde203ca38779ba9c85dd46dedd2d;hpb=82c74ae17858622bfaadbe96d1d5408a2cdb29a3;p=libucw.git

diff --git a/lib/ff-utf8.h b/lib/ff-utf8.h
index 296fb9d7..dd86ba65 100644
--- a/lib/ff-utf8.h
+++ b/lib/ff-utf8.h
@@ -2,6 +2,7 @@
  *	Sherlock Library: Reading and writing of UTF-8 on Fastbuf Streams
  *
  *	(c) 2001--2004 Martin Mares <mj@ucw.cz>
+ *	(c) 2004 Robert Spalek <robert@ucw.cz>
  *
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
@@ -14,14 +15,16 @@
 #include "lib/unicode.h"
 
 int bget_utf8_slow(struct fastbuf *b);
+int bget_utf8_32_slow(struct fastbuf *b);
 void bput_utf8_slow(struct fastbuf *b, uns u);
+void bput_utf8_32_slow(struct fastbuf *b, uns u);
 
 static inline int
 bget_utf8(struct fastbuf *b)
 {
   uns u;
 
-  if (b->bptr + 5 <= b->bstop)
+  if (bavailr(b) >= 3)
     {
       GET_UTF8(b->bptr, u);
       return u;
@@ -34,10 +37,34 @@ static inline void
 bput_utf8(struct fastbuf *b, uns u)
 {
   ASSERT(u < 65536);
-  if (b->bptr + 5 <= b->bufend)
+  if (bavailw(b) >= 3)
     PUT_UTF8(b->bptr, u);
   else
     bput_utf8_slow(b, u);
 }
 
+static inline int
+bget_utf8_32(struct fastbuf *b)
+{
+  uns u;
+
+  if (bavailr(b) >= 6)
+    {
+      GET_UTF8_32(b->bptr, u);
+      return u;
+    }
+  else
+    return bget_utf8_32_slow(b);
+}
+
+static inline void
+bput_utf8_32(struct fastbuf *b, uns u)
+{
+  ASSERT(u < (1U<<31));
+  if (bavailw(b) >= 6)
+    PUT_UTF8_32(b->bptr, u);
+  else
+    bput_utf8_32_slow(b, u);
+}
+
 #endif