TIP #617: Tcl_WCharLen/Tcl_Char16Len

1 files changed, 32 insertions, 1 deletions

diff --git a/generic/tclUtf.c b/generic/tclUtf.c
index fcdf80a..fae6edd 100644
--- a/generic/tclUtf.c
+++ b/generic/tclUtf.c
@@ -1773,6 +1773,36 @@ Tcl_UniCharToTitle(
 /*
  *----------------------------------------------------------------------
  *
+ * Tcl_Char16Len --
+ *
+ *	Find the length of a UniChar string. The str input must be null
+ *	terminated.
+ *
+ * Results:
+ *	Returns the length of str in UniChars (not bytes).
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+Tcl_Char16Len(
+    const unsigned short *uniStr)	/* Unicode string to find length of. */
+{
+    int len = 0;
+
+    while (*uniStr != '\0') {
+	len++;
+	uniStr++;
+    }
+    return len;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
  * Tcl_UniCharLen --
  *
  *	Find the length of a UniChar string. The str input must be null
@@ -1787,9 +1817,10 @@ Tcl_UniCharToTitle(
  *----------------------------------------------------------------------
  */
 
+#undef Tcl_UniCharLen
 int
 Tcl_UniCharLen(
-    const Tcl_UniChar *uniStr)	/* Unicode string to find length of. */
+    const int *uniStr)	/* Unicode string to find length of. */
 {
     int len = 0;