From: Daiki Ueno <ueno@gnu.org>
Date: Mon, 23 May 2016 03:02:31 +0000 (+0900)
Subject: javascript: Fix format type compatibility check
X-Git-Tag: v0.19.8~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9920621eaa425905c52c13ee8a7fadc8d67913e3;p=thirdparty%2Fgettext.git

javascript: Fix format type compatibility check

* gettext-tools/src/format-javascript.c (format_check): Check if the two
argument types are the same.
---

diff --git a/gettext-tools/src/format-javascript.c b/gettext-tools/src/format-javascript.c
index c9c3d3272..42f2dce34 100644
--- a/gettext-tools/src/format-javascript.c
+++ b/gettext-tools/src/format-javascript.c
@@ -381,9 +381,10 @@ format_check (void *msgid_descr, void *msgstr_descr, bool equality,
           {
             if (spec1->numbered[i].number == spec2->numbered[j].number)
               {
-                if (!equality
-                    && (spec1->numbered[i].type == FAT_ANY
-                        || spec2->numbered[i].type == FAT_ANY))
+                if (!(spec1->numbered[i].type == spec2->numbered[j].type
+                      || (!equality
+                          && (spec1->numbered[i].type == FAT_ANY
+                              || spec2->numbered[i].type == FAT_ANY))))
                   {
                     if (error_logger)
                       error_logger (_("format specifications in '%s' and '%s' for argument %u are not the same"),