Adding upstream version 4.4.0.upstream/4.4.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 20 insertions, 22 deletions

diff --git a/fix/FIX.xml b/fix/FIX.xml
index 1378cdc0..22163976 100644
--- a/fix/FIX.xml
+++ b/fix/FIX.xml
@@ -7393,7 +7393,7 @@
   <field number='393' name='TotNoRelatedSym' type='INT' />
   <field number='394' name='BidType' type='INT'>
    <value enum='1' description='NON_DISCLOSED_STYLE' />
-   <value enum='2' description='DISCLOSED_SYTLE' />
+   <value enum='2' description='DISCLOSED_STYLE' />
    <value enum='3' description='NO_BIDDING_PROCESS' />
   </field>
   <field number='395' name='NumTickets' type='INT' />
@@ -7574,7 +7574,7 @@
    <value enum='12' description='EXECUTING_TRADER' />
    <value enum='13' description='ORDER_ORIGINATION_FIRM' />
    <value enum='14' description='GIVEUP_CLEARING_FIRM' />
-   <value enum='15' description='CORRESPONDANT_CLEARING_FIRM' />
+   <value enum='15' description='CORRESPONDENT_CLEARING_FIRM' />
    <value enum='16' description='EXECUTING_SYSTEM' />
    <value enum='17' description='CONTRA_FIRM' />
    <value enum='18' description='CONTRA_CLEARING_FIRM' />
diff --git a/fix/FIX43.xml b/fix/FIX43.xml
index beb1a536..d64f8e21 100644
--- a/fix/FIX43.xml
+++ b/fix/FIX43.xml
@@ -3578,7 +3578,7 @@
       <value enum="12" description="EXECUTING_TRADER" />
       <value enum="13" description="ORDER_ORIGINATION_FIRM" />
       <value enum="14" description="GIVEUP_CLEARING_FIRM" />
-      <value enum="15" description="CORRESPONDANT_CLEARING_FIRM" />
+      <value enum="15" description="CORRESPONDENT_CLEARING_FIRM" />
       <value enum="16" description="EXECUTING_SYSTEM" />
       <value enum="17" description="CONTRA_FIRM" />
       <value enum="18" description="CONTRA_CLEARING_FIRM" />
diff --git a/fix/FIX50.xml b/fix/FIX50.xml
index 3495dc6c..afbf3036 100644
--- a/fix/FIX50.xml
+++ b/fix/FIX50.xml
@@ -6027,7 +6027,7 @@
   <field number='393' name='TotNoRelatedSym' type='INT' />
   <field number='394' name='BidType' type='INT'>
    <value enum='1' description='NON_DISCLOSED_STYLE' />
-   <value enum='2' description='DISCLOSED_SYTLE' />
+   <value enum='2' description='DISCLOSED_STYLE' />
    <value enum='3' description='NO_BIDDING_PROCESS' />
   </field>
   <field number='395' name='NumTickets' type='INT' />
@@ -6208,7 +6208,7 @@
    <value enum='12' description='EXECUTING_TRADER' />
    <value enum='13' description='ORDER_ORIGINATION_FIRM' />
    <value enum='14' description='GIVEUP_CLEARING_FIRM' />
-   <value enum='15' description='CORRESPONDANT_CLEARING_FIRM' />
+   <value enum='15' description='CORRESPONDENT_CLEARING_FIRM' />
    <value enum='16' description='EXECUTING_SYSTEM' />
    <value enum='17' description='CONTRA_FIRM' />
    <value enum='18' description='CONTRA_CLEARING_FIRM' />
diff --git a/fix/FIX50SP1.xml b/fix/FIX50SP1.xml
index 64d8f9ac..adf45071 100644
--- a/fix/FIX50SP1.xml
+++ b/fix/FIX50SP1.xml
@@ -6844,7 +6844,7 @@
   <field number='393' name='TotNoRelatedSym' type='INT' />
   <field number='394' name='BidType' type='INT'>
    <value enum='1' description='NON_DISCLOSED_STYLE' />
-   <value enum='2' description='DISCLOSED_SYTLE' />
+   <value enum='2' description='DISCLOSED_STYLE' />
    <value enum='3' description='NO_BIDDING_PROCESS' />
   </field>
   <field number='395' name='NumTickets' type='INT' />
@@ -7025,7 +7025,7 @@
    <value enum='12' description='EXECUTING_TRADER' />
    <value enum='13' description='ORDER_ORIGINATION_FIRM' />
    <value enum='14' description='GIVEUP_CLEARING_FIRM' />
-   <value enum='15' description='CORRESPONDANT_CLEARING_FIRM' />
+   <value enum='15' description='CORRESPONDENT_CLEARING_FIRM' />
    <value enum='16' description='EXECUTING_SYSTEM' />
    <value enum='17' description='CONTRA_FIRM' />
    <value enum='18' description='CONTRA_CLEARING_FIRM' />
diff --git a/fix/FIX50SP2.xml b/fix/FIX50SP2.xml
index fa0f115f..cf50a427 100644
--- a/fix/FIX50SP2.xml
+++ b/fix/FIX50SP2.xml
@@ -7327,7 +7327,7 @@
   <field number='393' name='TotNoRelatedSym' type='INT' />
   <field number='394' name='BidType' type='INT'>
    <value enum='1' description='NON_DISCLOSED_STYLE' />
-   <value enum='2' description='DISCLOSED_SYTLE' />
+   <value enum='2' description='DISCLOSED_STYLE' />
    <value enum='3' description='NO_BIDDING_PROCESS' />
   </field>
   <field number='395' name='NumTickets' type='INT' />
@@ -7508,7 +7508,7 @@
    <value enum='12' description='EXECUTING_TRADER' />
    <value enum='13' description='ORDER_ORIGINATION_FIRM' />
    <value enum='14' description='GIVEUP_CLEARING_FIRM' />
-   <value enum='15' description='CORRESPONDANT_CLEARING_FIRM' />
+   <value enum='15' description='CORRESPONDENT_CLEARING_FIRM' />
    <value enum='16' description='EXECUTING_SYSTEM' />
    <value enum='17' description='CONTRA_FIRM' />
    <value enum='18' description='CONTRA_CLEARING_FIRM' />
diff --git a/fix/Values.xsl b/fix/Values.xsl
index 106eb68b..d95a5f07 100644
--- a/fix/Values.xsl
+++ b/fix/Values.xsl
@@ -14,7 +14,6 @@ Syntax: xsltproc Values.xsl FIX44.xml
 
 typedef struct _fix_field {
     int      tag;         /* FIX tag */
-    int      hf_id;
     int      type;        /* */
     const void *table;
 } fix_field;
@@ -24,7 +23,7 @@ typedef struct _fix_field {
 </xsl:template>
 
 <!--
-translate(@description,$uppercase,$smallcase)  
+translate(@description,$uppercase,$smallcase)
 -->
 
 <xsl:variable name="smallcase" select="'abcdefghijklmnopqrstuvwxyz'" />
@@ -59,7 +58,7 @@ translate(@description,$uppercase,$smallcase)
 <xsl:template match="fix/messages">
     static const string_string messages_val[] = {<xsl:for-each select="message">
         { "<xsl:value-of select="@msgtype"/>", "<xsl:value-of select="@name"/>" },</xsl:for-each>
-        { "", NULL }
+        { 0, NULL }
     };
 </xsl:template>
 
diff --git a/fix/hfDecl.xsl b/fix/hfDecl.xsl
index b44d32e8..ae50d80b 100644
--- a/fix/hfDecl.xsl
+++ b/fix/hfDecl.xsl
@@ -6,14 +6,8 @@
 
  <xsl:template match="text()"/>
 
- <xsl:template match="/">
-static fix_field fix_fields[] = {
-<xsl:apply-templates/>
-    };
-</xsl:template>
-
-
 <xsl:template match="fields">
+static const fix_field fix_fields[] = {
 <xsl:for-each select="field">
     <xsl:sort select="@number" data-type="number"/>
     <xsl:choose>
@@ -25,10 +19,15 @@ static fix_field fix_fields[] = {
                     <xsl:otherwise>2</xsl:otherwise>
                   </xsl:choose>
                 </xsl:variable>
-        { <xsl:value-of select="@number"/>, -1, <xsl:copy-of select="$val_type" />, <xsl:value-of select="@name"/>_val },</xsl:when>
+        { <xsl:value-of select="@number"/>, <xsl:copy-of select="$val_type" />, <xsl:value-of select="@name"/>_val },</xsl:when>
           <xsl:otherwise>
-        { <xsl:value-of select="@number"/>, -1, 0, NULL }, /* <xsl:value-of select="@name"/> */</xsl:otherwise>
+        { <xsl:value-of select="@number"/>, 0, NULL }, /* <xsl:value-of select="@name"/> */</xsl:otherwise>
     </xsl:choose>
 </xsl:for-each>
+    };
+
+<xsl:text>static int fix_hf[</xsl:text>
+<xsl:value-of select="count( field )"/>
+<xsl:text>];</xsl:text>
 </xsl:template>
 </xsl:stylesheet>
diff --git a/fix/hfField.xsl b/fix/hfField.xsl
index 15e1817c..a1edce22 100644
--- a/fix/hfField.xsl
+++ b/fix/hfField.xsl
@@ -29,7 +29,7 @@ static hf_register_info hf_FIX[] = {
 <xsl:template match="fields">
 <xsl:for-each select="field">
     <xsl:sort select="@number" data-type="number"/>
-        { &amp;fix_fields[<xsl:value-of select="position( ) -1" />].hf_id,
+        { &amp;fix_hf[<xsl:value-of select="position( ) -1" />],
             { "<xsl:value-of select="@name"/> (<xsl:value-of select="@number"/>)", "fix.<xsl:value-of select="@name"/>",
             FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }