Sped up utf8_strlen(), introduced utf8_strnlen().

diff --git a/charset/strlen.c b/charset/strlen.c
index 39c1cb5bae1a44c39d1a79d1f7435889ab770dc5..1fb0f7562a46657cb34076357945145cb4f54494 100644 (file)
--- a/charset/strlen.c
+++ b/charset/strlen.c
@@ -1,7 +1,7 @@
 /*
  *     The UniCode Library -- String Length
  *
- *     (c) 1997 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2003 Martin Mares <mj@ucw.cz>
  *     (c) 2003 Robert Spalek <robert@ucw.cz>
  *
  *     This software may be freely distributed and used according to the terms
@@ -25,13 +25,23 @@ uns
 utf8_strlen(byte *str)
 {
   uns len = 0;
-  while (1)
-  {
-    uns c;
-    GET_UTF8(str, c);
-    if (!c)
-      return len;
-    len++;
-  }
+  while (*str)
+    {
+      UTF8_SKIP(str);
+      len++;
+    }
+  return len;
 }
 
+uns
+utf8_strnlen(byte *str, uns n)
+{
+  uns len = 0;
+  byte *end = str + n;
+  while (str < end)
+    {
+      UTF8_SKIP(str);
+      len++;
+    }
+  return len;
+}

diff --git a/charset/unicode.h b/charset/unicode.h
index 1e11e0f7a9315dd2637ac5f894a830d7d75bdf95..80c4ff88a7815bf562b80960d82dbc44bc8e8bb3 100644 (file)
--- a/charset/unicode.h
+++ b/charset/unicode.h
@@ -1,7 +1,7 @@
 /*
  *     The UniCode Library
  *
- *     (c) 1997 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2003 Martin Mares <mj@ucw.cz>
  *
  *     This software may be freely distributed and used according to the terms
  *     of the GNU Lesser General Public License.
@@ -119,5 +119,6 @@ uns utf8_to_ucs2(word *, byte *);
 byte *static_ucs2_to_utf8(word *);
 uns Ustrlen(word *);
 uns utf8_strlen(byte *str);
+uns utf8_strnlen(byte *str, uns n);
 
 #endif