Consistent binaries for shipped platforms

Author: ibmmqmet

bin/aix/mqsmfcsv

@@ -196,6 +196,7 @@ extern char *strMQMON (int v);
 extern char *strMQCHT (int v);
 extern char *strMQCHS  (int v);
 extern char *strMQCHLD  (int v);
+extern char *strCfStatType  (int v);
 
 /**********************************************************/
 /* How long are the lines for data and headings.          */

bin/linux/mqsmfcsv

@@ -66,7 +66,7 @@ void printDDL(char *name, int type, int len)
   case DDL_C:
     if (!strcmp(name,"Date")) /* special case for CommonHeader field */
     {
-      fprintf(fp,"%s \"%s\" \t CHAR(10)\n",comma,format(nameCopy));
+      fprintf(fp,"%s \"%s\" \t DATE    \n",comma,format(nameCopy));
     }
     else
     {
@@ -97,7 +97,7 @@ void printDDL(char *name, int type, int len)
 
     p2 = strstr(nameCopy," (DATE)");
     if (p2) *p2 = 0;
-    fprintf(fp,"%s \"%s_Date\" \t CHAR(10)\n",comma,format(nameCopy));
+    fprintf(fp,"%s \"%s_Date\" \t DATE\n",comma,format(nameCopy));
 
     p = p+1;
     if (p2) p2 = strstr(p," (TIME)");

bin/win/mqsmfcsv.exe

@@ -56,7 +56,7 @@ static char *sqlFmt = "\"%Y-%m-%d\",\"%H:%M:%S";
 static char *csvFmt = "\"%Y/%m/%d\",\"%H:%M:%S";
 static char *sqlEpoch = "\"1970-01-01\",\"00:00:00,000000\"";
 static char *csvEpoch = "\"1970/01/01\",\"00:00:00,000000\"";
-static char *emptyTime = "\"\",\"\"";
+static char *csvEmpty = "\"\",\"\"";
 static char stckTime[64] = {0};
 
 /********************************************************************/
@@ -76,8 +76,22 @@ char * convDate(unsigned long long stcki)
   struct tm *t;
   char *fmt;
   char *epochTime;
+  char *emptyTime;
   size_t offset;
 
+  if (sqlMode)
+  { 
+    epochTime = sqlEpoch;
+    emptyTime = sqlEpoch;
+    fmt = sqlFmt;
+  }
+  else
+  {
+    epochTime = csvEpoch;
+    emptyTime = csvEmpty; 
+    fmt = csvFmt;
+  }
+
   stck = conv64(stcki);   /* Always passed in z/OS endian; ensure converted */
 
   if (stck == 0 )
@@ -96,16 +110,6 @@ char * convDate(unsigned long long stcki)
 
   t = localtime(&sec);                 /* Turn seconds into tm structure...*/
 
-  if (sqlMode)
-  { 
-    epochTime = sqlEpoch;
-    fmt = sqlFmt;
-  }
-  else
-  {
-    epochTime = csvEpoch;
-    fmt = csvFmt;
-  }
   offset = strftime(stckTime,sizeof(stckTime)-1,fmt,t); /* ...and format it*/
   if (offset == 0 || stck < EPOCH1970)
   {