From: VMware, Inc <>
Date: Mon, 20 Dec 2010 21:46:10 +0000 (-0800)
Subject: lib/unicode: the bug fixing continues
X-Git-Tag: 2010.12.19-339835~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a057db5c449b3f06c2fb2c70ef288c90dc98a37f;p=thirdparty%2Fopen-vm-tools.git

lib/unicode: the bug fixing continues

Unicode_CompareRange does not need to pin it's indices; that's
done within Unicode_Substr.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/unicode/unicodeSimpleOperations.c b/open-vm-tools/lib/unicode/unicodeSimpleOperations.c
index 4bcbb0050..4350cae27 100644
--- a/open-vm-tools/lib/unicode/unicodeSimpleOperations.c
+++ b/open-vm-tools/lib/unicode/unicodeSimpleOperations.c
@@ -70,13 +70,13 @@
  */
 
 int
-Unicode_CompareRange(ConstUnicode str1,       // IN
-                     UnicodeIndex str1Start,  // IN
-                     UnicodeIndex str1Length, // IN
-                     ConstUnicode str2,       // IN
-                     UnicodeIndex str2Start,  // IN
-                     UnicodeIndex str2Length, // IN
-                     Bool ignoreCase)         // IN
+Unicode_CompareRange(ConstUnicode str1,        // IN:
+                     UnicodeIndex str1Start,   // IN:
+                     UnicodeIndex str1Length,  // IN:
+                     ConstUnicode str2,        // IN:
+                     UnicodeIndex str2Start,   // IN:
+                     UnicodeIndex str2Length,  // IN:
+                     Bool ignoreCase)          // IN:
 {
    int result = -1;
    Unicode substr1 = NULL;
@@ -90,9 +90,6 @@ Unicode_CompareRange(ConstUnicode str1,       // IN
    uint32 codePoint1;
    uint32 codePoint2;
 
-   UnicodePinIndices(str1, &str1Start, &str1Length);
-   UnicodePinIndices(str2, &str2Start, &str2Length);
-
    /*
     * TODO: Allocating substrings is a performance hit.  We should do this
     * search in-place.  (However, searching UTF-8 requires tender loving