patch 8.1.1085: compiler warning for possibly uninitialized variable

Problem:    Compiler warning for possibly uninitialized variable. (Tony
            Mechelynck)
Solution:   Make conditions more logical.

diff --git a/src/arabic.c b/src/arabic.c
index d323abf64417e843d2ed37d5ad2841aba001daf7..efc6aa66db45768a69b7a596fd964596cf48c9e1 100644 (file)
--- a/src/arabic.c
+++ b/src/arabic.c
@@ -363,18 +363,23 @@ arabic_shape(
        int backward_combine = !prev_laa && can_join(prev_c, c);
        int forward_combine = can_join(c, next_c);
 
-       if (backward_combine && forward_combine)
-           curr_c = curr_a->medial;
-       if (backward_combine && !forward_combine)
-           curr_c = curr_a->final;
-       if (!backward_combine && forward_combine)
-           curr_c = curr_a->initial;
-       if (!backward_combine && !forward_combine)
-           curr_c = curr_a->isolated;
+       if (backward_combine)
+       {
+           if (forward_combine)
+               curr_c = curr_a->medial;
+           else
+               curr_c = curr_a->final;
+       }
+       else
+       {
+           if (forward_combine)
+               curr_c = curr_a->initial;
+           else
+               curr_c = curr_a->isolated;
+       }
     }
 
-    // Sanity check -- curr_c should, in the future, never be 0.
-    // We should, in the future, insert a fatal error here.
+    // Character missing from the table means using original character.
     if (curr_c == NUL)
        curr_c = c;
 

diff --git a/src/version.c b/src/version.c
index 74fa0bd55f83d620c191a8b7753d870c6ee0b1ea..a4744722db263f5eb88dab6c31961bec55a1af2f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -775,6 +775,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1085,
 /**/
     1084,
 /**/