Henri Verbeet : usp10: Make "pair_count" unsigned in computeBracketPairs() .

Alexandre Julliard julliard at winehq.org
Tue Feb 20 16:44:53 CST 2018


Module: wine
Branch: master
Commit: 24f64acc357a4682b3caa6e6a97db2ba9875dfad
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=24f64acc357a4682b3caa6e6a97db2ba9875dfad

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Feb 20 10:21:59 2018 +0330

usp10: Make "pair_count" unsigned in computeBracketPairs().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Aric Stewart <aric at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/usp10/bidi.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c
index 8f94ede..2277190 100644
--- a/dlls/usp10/bidi.c
+++ b/dlls/usp10/bidi.c
@@ -692,8 +692,8 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run)
     WCHAR *open_stack;
     int *stack_index;
     int stack_top = iso_run->length;
+    unsigned int pair_count = 0;
     BracketPair *out = NULL;
-    int pair_count = 0;
     int i;
 
     open_stack = heap_alloc(iso_run->length * sizeof(*open_stack));
@@ -745,13 +745,13 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run)
     heap_free(open_stack);
     heap_free(stack_index);
 
-    if (pair_count == 0)
+    if (!pair_count)
     {
         heap_free(out);
-        out = NULL;
+        return NULL;
     }
-    else if (pair_count > 1)
-        qsort(out, pair_count, sizeof(BracketPair), compr);
+
+    qsort(out, pair_count, sizeof(*out), compr);
 
     return out;
 }




More information about the wine-cvs mailing list