QJST fix for 912 structure size change

ibm-messaging · Apr 29, 2019 · b4c6395 · b4c6395
1 parent 5d9daf9
commit b4c6395
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -86,3 +86,6 @@ Sep 2018 (v5.0.0)
 
 Mar 2019 (v5.1.0)
 * Add support for MQ 9.1.2 zHyperWrite
+
+Apr 2019 (v5.1.1)
+* The 912 changes broke QJST printing
diff --git a/bin/aix/convH b/bin/aix/convH
diff --git a/bin/aix/mqsmfcsv b/bin/aix/mqsmfcsv
diff --git a/bin/linux/convH b/bin/linux/convH
diff --git a/bin/linux/mqsmfcsv b/bin/linux/mqsmfcsv
diff --git a/bin/win/mqsmfcsv.exe b/bin/win/mqsmfcsv.exe
diff --git a/src/printQCST.c b/src/printQCST.c
@@ -65,7 +65,7 @@ void printQCST(qcst *p)
   ADDU32  ("XmitQ_Empty_Count",p->qcstqetc);
   ADDU32  ("Batch_Interval"  ,p->qcstcbit);
   ADDU32  ("Batch_Data_Limit",p->qcstcbdl);
-  ADDU32  ("Dispatcher_Numer",p->qcstdspn);
+  ADDU16  ("Dispatcher_Numer",p->qcstdspn);
 
   SMFPRINTSTOP;
   return;

diff --git a/src/printQJST.c b/src/printQJST.c
@@ -68,7 +68,7 @@ void printQJST(qjst *p)
     }
   }
 
-  if (conv16(p->qjstll)>=sizeof(qjst))
+  if (conv16(p->qjstll)>=offsetof(qjst,qjstio[0]))
   {
     for (i=0;i<2;i++)
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -68,7 +68,7 @@ void printQJST(qjst *p) @@
         }
       }
-      if (conv16(p->qjstll)>=sizeof(qjst))
+      if (conv16(p->qjstll)>=offsetof(qjst,qjstio[0]))
       {
         for (i=0;i<2;i++)
         {
@@ Expand Down @@