OSDN Git Service

eliminate needless branch condition
authorUrabe, Shyouhei <shyouhei@ruby-lang.org>
Tue, 22 Mar 2016 11:12:37 +0000 (20:12 +0900)
committerUrabe, Shyouhei <shyouhei@ruby-lang.org>
Tue, 22 Mar 2016 11:12:37 +0000 (20:12 +0900)
We already see `if (fold_preserve_f) {` before those lines, so reaching
here indicates `fold_preserve_f` is always false.

nkf.c

diff --git a/nkf.c b/nkf.c
index 6cdb026..8d3d798 100644 (file)
--- a/nkf.c
+++ b/nkf.c
@@ -3834,8 +3834,8 @@ fold_conv(nkf_char c2, nkf_char c1)
            f_prev = c1;
            f_line = 0;
            fold_state =  CR;
-       } else if ((f_prev == c1 && !fold_preserve_f)
-                  || (f_prev == LF && fold_preserve_f)
+       } else if ((f_prev == c1)
+                  || (f_prev == LF)
                  ) {        /* duplicate newline */
            if (f_line) {
                f_line = 0;