Make sure Format in structures is space-padded (see MQ APAR IT13736). Mentioned in #106

Author: ibmmqmet

ibmmq/mqi.go

@@ -122,6 +122,7 @@ func (e *MQReturn) Error() string {
 }
 
 var endian binary.ByteOrder // Used by structure formatters such as MQCFH
+const space8 = "        "
 
 /*
  * Copy a Go string in "strings"

ibmmq/mqiDLH.go

@@ -100,7 +100,8 @@ func (dlh *MQDLH) Bytes() []byte {
 	offset += 4
 	endian.PutUint32(buf[offset:], uint32(dlh.CodedCharSetId))
 	offset += 4
-	copy(buf[offset:], dlh.Format)
+	// Make sure the format is space padded to the correct length
+	copy(buf[offset:], (dlh.Format + space8)[0:8])
 	offset += int(MQ_FORMAT_LENGTH)
 	endian.PutUint32(buf[offset:], uint32(dlh.PutApplType))
 	offset += 4

ibmmq/mqiMQMD.go

@@ -78,7 +78,7 @@ func NewMQMD() *MQMD {
 	md.Feedback = int32(C.MQFB_NONE)
 	md.Encoding = int32(C.MQENC_NATIVE)
 	md.CodedCharSetId = int32(C.MQCCSI_Q_MGR)
-	md.Format = "        "
+	md.Format = space8
 	md.Priority = int32(C.MQPRI_PRIORITY_AS_Q_DEF)
 	md.Persistence = int32(C.MQPER_PERSISTENCE_AS_Q_DEF)
 	md.MsgId = bytes.Repeat([]byte{0}, C.MQ_MSG_ID_LENGTH)
@@ -113,7 +113,8 @@ func copyMDtoC(mqmd *C.MQMD, gomd *MQMD) {
 	mqmd.Feedback = C.MQLONG(gomd.Feedback)
 	mqmd.Encoding = C.MQLONG(gomd.Encoding)
 	mqmd.CodedCharSetId = C.MQLONG(gomd.CodedCharSetId)
-	setMQIString((*C.char)(&mqmd.Format[0]), gomd.Format, C.MQ_FORMAT_LENGTH)
+	// Make sure Format is space padded
+	setMQIString((*C.char)(&mqmd.Format[0]), (gomd.Format + space8), C.MQ_FORMAT_LENGTH)
 	mqmd.Priority = C.MQLONG(gomd.Priority)
 	mqmd.Persistence = C.MQLONG(gomd.Persistence)