Fix misuse of a logical operator.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index ebe7ed9de45ac72e04762a1e4849b8394f00e2b6..4e3891a6111905fad6248691ed620c831e40310d 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-11  Daiki Ueno  <ueno@gnu.org>
+
+       * x-c.c (phase5_get): Fix misuse of a logical operator.
+       * x-perl.c (extract_quotelike_pass3): Likewise.
+       * x-vala.c (phase3_get): Likewise.
+       Reported by David Binderman at: <https://savannah.gnu.org/bugs/?40528>.
+
 2013-08-12  Daiki Ueno  <ueno@gnu.org>
 
        * xgettext.c (remember_a_message): Handle multi-line extracted

diff --git a/gettext-tools/src/x-c.c b/gettext-tools/src/x-c.c
index ea0a874a9f3749d80965416ded10b671dcaa5623..8af7429bb419a91de14bd0e73e6fbeea10eb24ab 100644 (file)
--- a/gettext-tools/src/x-c.c
+++ b/gettext-tools/src/x-c.c
@@ -1171,7 +1171,7 @@ phase5_get (token_ty *tp)
                 }
               buffer[bufpos++] = c;
               c = phase4_getc ();
-              if (c != '+' || c != '-')
+              if (c != '+' && c != '-')
                 {
                   phase4_ungetc (c);
                   break;

diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c
index c7843c40539c0e542fe07bc38f3f2297b4e07100..571f6dee569ee47234dfddd0f4f92931735ee4ab 100644 (file)
--- a/gettext-tools/src/x-perl.c
+++ b/gettext-tools/src/x-perl.c
@@ -1085,7 +1085,7 @@ extract_quotelike_pass3 (token_ty *tp, int error_level)
               if (*crs)
                 {
                   int the_char = (unsigned char) *crs;
-                  if (the_char >= 'a' || the_char <= 'z')
+                  if (the_char >= 'a' && the_char <= 'z')
                     the_char = the_char - 'a' + 'A';
                   buffer[bufpos++] = the_char ^ 0x40;
                 }

diff --git a/gettext-tools/src/x-vala.c b/gettext-tools/src/x-vala.c
index 2faa513ee225cb57ea2297e97ed73470a5234b39..68c8d9cebea30108e85a0467b1bc4709a9160680 100644 (file)
--- a/gettext-tools/src/x-vala.c
+++ b/gettext-tools/src/x-vala.c
@@ -715,7 +715,7 @@ phase3_get (token_ty *tp)
                     }
                   buffer[bufpos++] = c;
                   c = phase2_getc ();
-                  if (c != '+' || c != '-')
+                  if (c != '+' && c != '-')
                     {
                       phase2_ungetc (c);
                       break;