Update for MQ 934

ibm-messaging · Oct 18, 2023 · 72d0c84 · 72d0c84
1 parent 93f51f4
commit 72d0c84
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 16 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,8 +2,9 @@
 History (newest at top)
 =======================
 
-Sep 2023 (v5.4.4)
+Oct 2023 (v5.4.4)
 * Try to recognise some input file corruption and cleanly exit
+* Update for MQ V9.3.4 (no changes to SMF records)
 
 Jun 2023 (v5.4.3)
 * Update for MQ V9.3.3

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/convH.exe b/bin/win/convH.exe
diff --git a/bin/win/mqsmfcsv.exe b/bin/win/mqsmfcsv.exe
diff --git a/src/M b/src/M
@@ -4,7 +4,7 @@ plat=`uname`
 
 if [ -z "$VERS" ]
 then
-  VERS="933"
+  VERS="934"
 fi
 
 if [ "$plat" = "AIX" ]

diff --git a/src/Makefile.gcc.win b/src/Makefile.gcc.win
@@ -3,7 +3,7 @@ CC=i686-w64-mingw32-gcc
 # CFLAGS= -I. -m32 -fpack-struct=8 -DPLATFORM_WINDOWS 
 CFLAGS= -I. -m32  -DPLATFORM_WINDOWS 
 PLATFLAGS=
-VERS=933
+VERS=934
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

diff --git a/src/Makefile.win b/src/Makefile.win
@@ -1,5 +1,5 @@
 CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J /O2 /DPLATFORM_WINDOWS
-VERS=933
+VERS=934
 SRC = mqsmf.c \
       smfDDL.c \
       smfDate.c \

diff --git a/src/convH64.c b/src/convH64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2022 IBM Corporation and other Contributors.
+ * Copyright (c) 2016, 2023 IBM Corporation and other Contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -419,7 +419,7 @@ void printHeader(char *version)
   printf(" * by the convH program (convH64.c) in the src directory\n");
   printf(" * Do not try to edit this header manually.\n");
   printf(" * \n");
-  printf(" * (C) Copyright IBM Corp. 1993, 2022 All Rights Reserved.\n");
+  printf(" * (C) Copyright IBM Corp. 1993, 2023 All Rights Reserved.\n");
   printf(" * \n");
   printf(" */\n");
 }
diff --git a/src/mqsmf.c b/src/mqsmf.c
@@ -89,9 +89,11 @@
 #define fseeko  _fseeki64
 typedef signed long long myoff_t;
 typedef struct __stat64 mystat_t;
+#define LLX "%llx"
 #else
 typedef off_t myoff_t;
 typedef struct stat mystat_t;
+#define LLX "%08X"
 #endif
 
 #ifndef PATH_MAX
@@ -731,9 +733,9 @@ int main( int argc, char *argv[] )
         if (qwshlen <= 0)
         {
           FILE *dfp = printDEBUGStream();
-          fprintf(stderr,"Error: Data at file offset 0x%08X appears corrupt. Exiting the formatter.\n",currentOffset);
+          fprintf(stderr,"Error: Data at file offset 0x"LLX" appears corrupt. Exiting the formatter.\n",currentOffset);
           if (dfp) {
-            fprintf(dfp, "Error: Data at file offset 0x%08X appears corrupt. Exiting the formatter.\n",currentOffset);
+            fprintf(dfp, "Error: Data at file offset 0x"LLX" appears corrupt. Exiting the formatter.\n",currentOffset);
           }
           corruptData = TRUE;
           continue;

diff --git a/src/mqsmf.h b/src/mqsmf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 IBM Corporation and other Contributors.
+ * Copyright (c) 2016, 2023 IBM Corporation and other Contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/mqsmfstrucU.h b/src/mqsmfstrucU.h
@@ -1,9 +1,9 @@
 /*
- * This file was generated from cqsdsmfc.h version 933
+ * This file was generated from cqsdsmfc.h version 934
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
- * (C) Copyright IBM Corp. 1993, 2022 All Rights Reserved.
+ * (C) Copyright IBM Corp. 1993, 2023 All Rights Reserved.
  * 
  */
 #pragma pack(1)

diff --git a/src/mqsmfstrucW.h b/src/mqsmfstrucW.h
@@ -1,9 +1,9 @@
 /*
- * This file was generated from cqsdsmfc.h version 933
+ * This file was generated from cqsdsmfc.h version 934
  * by the convH program (convH64.c) in the src directory
  * Do not try to edit this header manually.
  * 
- * (C) Copyright IBM Corp. 1993, 2022 All Rights Reserved.
+ * (C) Copyright IBM Corp. 1993, 2023 All Rights Reserved.
  * 
  */
 #pragma pack(1)

diff --git a/src/printDEBUG.c b/src/printDEBUG.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 IBM Corporation and other Contributors.
+ * Copyright (c) 2016, 2023 IBM Corporation and other Contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/sizes.master.934 b/src/sizes.master.934
@@ -0,0 +1,40 @@
+q5st : 672
+qcct : 48
+qct_dsp : 36
+qct_adp : 32
+qct_ssl : 48
+qct_dns : 48
+qcst : 324
+qest : 4104
+qesd : 336
+qist : 80
+qis1 : 104
+qjst : 596
+qlst : 32
+qmac : 48
+qmst : 104
+qpst : 104
+qqst : 552
+qsgm : 48
+qsph : 88
+qsrs : 232
+qsst : 72
+qtst : 96
+qwac : 176
+qwhc : 92
+qwhs : 52
+wtas : 2344
+wtid : 208
+qwst : 28
+qws0 : 96
+qws1 : 72
+qws5 : 16
+qws8 : 16
+qws9 : 16
+qwsx : 48
+qwas : 28
+qwa0 : 56
+wq   : 2800
+wq->maxqdpth: 588
+wq->z__001  : 594
+qqst->qqstdpth  : 80
diff --git a/src/smfJson.c b/src/smfJson.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 IBM Corporation and other Contributors.
+ * Copyright (c) 2016, 2023 IBM Corporation and other Contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0

diff --git a/src/smfPrint.c b/src/smfPrint.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 IBM Corporation and other Contributors.
+ * Copyright (c) 2018, 2023 IBM Corporation and other Contributors.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0