diff options
author | zeertzjq <zeertzjq@outlook.com> | 2022-08-25 12:49:12 +0800 |
---|---|---|
committer | zeertzjq <zeertzjq@outlook.com> | 2022-08-25 12:53:34 +0800 |
commit | 711635872debd52930fac6d0a8f4204e7cc8d258 (patch) | |
tree | 9fd3f0c164804746e56275867068003bbbaf3ec7 | |
parent | e4e0e8ce6f282ad891d3e9b7cd66961d23e7cba3 (diff) | |
download | rneovim-711635872debd52930fac6d0a8f4204e7cc8d258.tar.gz rneovim-711635872debd52930fac6d0a8f4204e7cc8d258.tar.bz2 rneovim-711635872debd52930fac6d0a8f4204e7cc8d258.zip |
vim-patch:8.1.1085: compiler warning for possibly uninitialized variable
Problem: Compiler warning for possibly uninitialized variable. (Tony
Mechelynck)
Solution: Make conditions more logical.
https://github.com/vim/vim/commit/bd9bf266fccbf7b7f09e476e09b61f0133e914db
-rw-r--r-- | src/nvim/arabic.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/nvim/arabic.c b/src/nvim/arabic.c index 06536e6e2b..b57019286f 100644 --- a/src/nvim/arabic.c +++ b/src/nvim/arabic.c @@ -320,22 +320,22 @@ int arabic_shape(int c, int *ccp, int *c1p, int prev_c, int prev_c1, int next_c) 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 = (int)curr_a->medial; - } - if (backward_combine && !forward_combine) { - curr_c = (int)curr_a->final; - } - if (!backward_combine && forward_combine) { - curr_c = (int)curr_a->initial; - } - if (!backward_combine && !forward_combine) { - curr_c = (int)curr_a->isolated; + if (backward_combine) { + if (forward_combine) { + curr_c = (int)curr_a->medial; + } else { + curr_c = (int)curr_a->final; + } + } else { + if (forward_combine) { + curr_c = (int)curr_a->initial; + } else { + curr_c = (int)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; } |