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

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

usp10: Make "pair_count" unsigned in computeBracketPairs().
24f64acc · Henri Verbeet · Alexandre Julliard · f8cca445 · 24f64acc
Commit 24f64acc authored Feb 20, 2018 by Henri Verbeet Committed by Alexandre Julliard Feb 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

bidi.c dlls/usp10/bidi.c +5 -5

No files found.
--- 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;
 }