XML: Small bugfix in xml_merge_chars.

[libucw.git] / lib / ff-utf8.h

diff --git a/lib/ff-utf8.h b/lib/ff-utf8.h
index 83b6b7613f6a384fb294ef2c3569fe72db647466..af7543f26c32b46c468d32ed89ada342fa94cc79 100644 (file)
--- a/lib/ff-utf8.h
+++ b/lib/ff-utf8.h
@@ -1,70 +1,15 @@
 /*
- *     UCW Library: Reading and writing of UTF-8 on Fastbuf Streams
+ *     UCW Library: An alias for lib/ff-unicode.h (for backwards compatibility)
  *
- *     (c) 2001--2004 Martin Mares <mj@ucw.cz>
- *     (c) 2004 Robert Spalek <robert@ucw.cz>
+ *     (c) 2008 Pavel Charvat <pchar@ucw.cz>
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
  */
 
-#ifndef _FF_UTF8_H
-#define _FF_UTF8_H
+#ifndef _UCW_FF_UTF8_H
+#define _UCW_FF_UTF8_H
 
-#include "lib/fastbuf.h"
-#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 (bavailr(b) >= 3)
-    {
-      GET_UTF8(b->bptr, u);
-      return u;
-    }
-  else
-    return bget_utf8_slow(b);
-}
-
-static inline void
-bput_utf8(struct fastbuf *b, uns u)
-{
-  ASSERT(u < 65536);
-  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);
-}
+#include "lib/ff-unicode.h"
 
 #endif