From 5d6a6b46528b085d767f419a565f080941b6cd3c Mon Sep 17 00:00:00 2001
From: Alexis La Goutte <alexis.lagoutte@gmail.com>
Date: Sat, 5 Jan 2013 10:12:44 +0000
Subject: Fix regression from upgrade FIX 5.0 (Revision 46944)

../../../epan/dissectors/packet-fix.h:1450:10: error: multi-character character constant [-Werror=multichar]
../../../epan/dissectors/packet-fix.h:1451:10: error: multi-character character constant [-Werror=multichar]
[...]

When FIX field type is MULTIPLESTRINGVALUE use string_string (not value_string)

And regenerated packet-fix.h

svn path=/trunk/; revision=46947
---
 fix/FIX.xml    | 2 +-
 fix/Values.xsl | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'fix')

diff --git a/fix/FIX.xml b/fix/FIX.xml
index 2bb7148dd4..686f3f41e6 100644
--- a/fix/FIX.xml
+++ b/fix/FIX.xml
@@ -10604,4 +10604,4 @@
   <field number='1620' name='RiskEncodedSecurityDescLen' type='LENGTH' />
   <field number='1621' name='RiskEncodedSecurityDesc' type='DATA' />
  </fields>
-</fix>
\ No newline at end of file
+</fix>
diff --git a/fix/Values.xsl b/fix/Values.xsl
index 619cd9e54a..e4a2decb32 100644
--- a/fix/Values.xsl
+++ b/fix/Values.xsl
@@ -36,6 +36,7 @@ translate(@description,$uppercase,$smallcase)
     <xsl:variable name="val_type"  >
     <xsl:choose>   
            <xsl:when test="@type='STRING'"> string_string </xsl:when>
+           <xsl:when test="@type='MULTIPLESTRINGVALUE'"> string_string </xsl:when>
   	   <xsl:otherwise> value_string </xsl:otherwise>
     </xsl:choose>
     </xsl:variable>
@@ -43,6 +44,8 @@ translate(@description,$uppercase,$smallcase)
              <xsl:when test="../@type='INT'">
        { <xsl:value-of select="@enum"/>, "<xsl:value-of select="translate(@description,'_',' ')"/>" },</xsl:when>
              <xsl:when test="../@type='STRING'">
+       { "<xsl:value-of select="@enum"/>", "<xsl:value-of select="translate(@description,'_',' ')"/>" },</xsl:when>
+             <xsl:when test="../@type='MULTIPLESTRINGVALUE'">
        { "<xsl:value-of select="@enum"/>", "<xsl:value-of select="translate(@description,'_',' ')"/>" },</xsl:when>
   	     <xsl:otherwise>
        { '<xsl:value-of select="@enum"/>', "<xsl:value-of select="translate(@description,'_',' ')"/>" },</xsl:otherwise>
-- 
cgit v1.2.3