Changeset 594 for vendor/current/source3/lib/util_str.c

Timestamp:

Jul 1, 2011, 4:02:23 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.8

File:

• vendor/current/source3/lib/util_str.c (modified) (2 diffs)

vendor/current/source3/lib/util_str.c

@@ -1455 +1455 @@
 
 /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
  Count the number of UCS2 characters in a string. Normally this will
  be the same as the number of bytes in a string for single byte strings,
@@ -1462 +1538 @@
 size_t strlen_m(const char *s)
 {
-        size_t count = 0;
-
-        if (!s) {
-                return 0;
-        }
-
-        while (*s && !(((uint8_t)*s) & 0x80)) {
-                s++;
-                count++;
-        }
-
-        if (!*s) {
-                return count;
-        }
-
-        while (*s) {
-                size_t c_size;
-                codepoint_t c = next_codepoint(s, &c_size);
-                if (c < 0x10000) {
-                        /* Unicode char fits into 16 bits. */
-                        count += 1;
-                } else {
-                        /* Double-width unicode char - 32 bits. */
-                        count += 2;
-                }
-                s += c_size;
-        }
-
-        return count;
+        return strlen_m_ext(s, CH_UTF16LE);
 }