Skip to content

Commit 551282d

Browse files
ibmmqmetibmmqmet
committed
whitespace format
1 parent 525b71e commit 551282d

File tree

12 files changed

+1720
-1720
lines changed

12 files changed

+1720
-1720
lines changed

‎ibmmq/ibmmq_test.go

Lines changed: 252 additions & 252 deletions
Large diffs are not rendered by default.

‎ibmmq/mqi.go

Lines changed: 318 additions & 318 deletions
Large diffs are not rendered by default.

‎ibmmq/mqiMQCD.go

Lines changed: 141 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ package ibmmq
3030
import "C"
3131

3232
import (
33-
"unsafe"
33+
"unsafe"
3434
)
3535

3636
/*
@@ -39,23 +39,23 @@ Only fields relevant to a client connection are included in the
3939
Go version of this structure.
4040
*/
4141
type MQCD struct {
42-
ChannelName string
43-
ConnectionName string
44-
DiscInterval int32
45-
SecurityExit string
46-
SecurityUserData string
47-
MaxMsgLength int32
48-
HeartbeatInterval int32
49-
SSLCipherSpec string
50-
SSLPeerName string
51-
SSLClientAuth int32
52-
KeepAliveInterval int32
53-
SharingConversations int32
54-
PropertyControl int32
55-
ClientChannelWeight int32
56-
ConnectionAffinity int32
57-
DefReconnect int32
58-
CertificateLabel string
42+
ChannelName string
43+
ConnectionName string
44+
DiscInterval int32
45+
SecurityExit string
46+
SecurityUserData string
47+
MaxMsgLength int32
48+
HeartbeatInterval int32
49+
SSLCipherSpec string
50+
SSLPeerName string
51+
SSLClientAuth int32
52+
KeepAliveInterval int32
53+
SharingConversations int32
54+
PropertyControl int32
55+
ClientChannelWeight int32
56+
ConnectionAffinity int32
57+
DefReconnect int32
58+
CertificateLabel string
5959
}
6060

6161
/*
@@ -64,27 +64,27 @@ MQCD_CLIENT_CONN_DEFAULT
6464
*/
6565
func NewMQCD() *MQCD {
6666

67-
cd := new(MQCD)
68-
69-
cd.ChannelName = ""
70-
cd.DiscInterval = 6000
71-
cd.SecurityExit = ""
72-
cd.SecurityUserData = ""
73-
cd.MaxMsgLength = 4194304
74-
cd.ConnectionName = ""
75-
cd.HeartbeatInterval = 1
76-
cd.SSLCipherSpec = ""
77-
cd.SSLPeerName = ""
78-
cd.SSLClientAuth = int32(C.MQSCA_REQUIRED)
79-
cd.KeepAliveInterval = -1
80-
cd.SharingConversations = 10
81-
cd.PropertyControl = int32(C.MQPROP_COMPATIBILITY)
82-
cd.ClientChannelWeight = 0
83-
cd.ConnectionAffinity = int32(C.MQCAFTY_PREFERRED)
84-
cd.DefReconnect = int32(C.MQRCN_NO)
85-
cd.CertificateLabel = ""
86-
87-
return cd
67+
cd := new(MQCD)
68+
69+
cd.ChannelName = ""
70+
cd.DiscInterval = 6000
71+
cd.SecurityExit = ""
72+
cd.SecurityUserData = ""
73+
cd.MaxMsgLength = 4194304
74+
cd.ConnectionName = ""
75+
cd.HeartbeatInterval = 1
76+
cd.SSLCipherSpec = ""
77+
cd.SSLPeerName = ""
78+
cd.SSLClientAuth = int32(C.MQSCA_REQUIRED)
79+
cd.KeepAliveInterval = -1
80+
cd.SharingConversations = 10
81+
cd.PropertyControl = int32(C.MQPROP_COMPATIBILITY)
82+
cd.ClientChannelWeight = 0
83+
cd.ConnectionAffinity = int32(C.MQCAFTY_PREFERRED)
84+
cd.DefReconnect = int32(C.MQRCN_NO)
85+
cd.CertificateLabel = ""
86+
87+
return cd
8888
}
8989

9090
/*
@@ -97,104 +97,104 @@ MQ_CLIENT_CONN_DEFAULT structure for consistency.
9797
*/
9898
func copyCDtoC(mqcd *C.MQCD, gocd *MQCD) {
9999

100-
setMQIString((*C.char)(&mqcd.ChannelName[0]), gocd.ChannelName, C.MQ_CHANNEL_NAME_LENGTH)
101-
mqcd.Version = C.MQCD_VERSION_11 // The version this is written to match
102-
mqcd.ChannelType = C.MQCHT_CLNTCONN
103-
mqcd.TransportType = C.MQXPT_TCP
104-
setMQIString((*C.char)(&mqcd.Desc[0]), "", C.MQ_CHANNEL_DESC_LENGTH)
105-
setMQIString((*C.char)(&mqcd.QMgrName[0]), "", C.MQ_OBJECT_NAME_LENGTH)
106-
setMQIString((*C.char)(&mqcd.XmitQName[0]), "", C.MQ_OBJECT_NAME_LENGTH)
107-
setMQIString((*C.char)(&mqcd.ShortConnectionName[0]), "", C.MQ_SHORT_CONN_NAME_LENGTH)
108-
setMQIString((*C.char)(&mqcd.MCAName[0]), "", C.MQ_MCA_NAME_LENGTH)
109-
setMQIString((*C.char)(&mqcd.ModeName[0]), "", C.MQ_MODE_NAME_LENGTH)
110-
setMQIString((*C.char)(&mqcd.TpName[0]), "", C.MQ_TP_NAME_LENGTH)
111-
mqcd.BatchSize = 50
112-
mqcd.DiscInterval = 6000
113-
mqcd.ShortRetryCount = 10
114-
mqcd.ShortRetryInterval = 60
115-
mqcd.LongRetryCount = 999999999
116-
mqcd.LongRetryInterval = 1200
117-
setMQIString((*C.char)(&mqcd.SecurityExit[0]), gocd.SecurityExit, C.MQ_EXIT_NAME_LENGTH)
118-
setMQIString((*C.char)(&mqcd.MsgExit[0]), "", C.MQ_EXIT_NAME_LENGTH)
119-
setMQIString((*C.char)(&mqcd.SendExit[0]), "", C.MQ_EXIT_NAME_LENGTH)
120-
setMQIString((*C.char)(&mqcd.ReceiveExit[0]), "", C.MQ_EXIT_NAME_LENGTH)
121-
mqcd.SeqNumberWrap = 999999999
122-
mqcd.MaxMsgLength = C.MQLONG(gocd.MaxMsgLength)
123-
mqcd.PutAuthority = C.MQPA_DEFAULT
124-
mqcd.DataConversion = C.MQCDC_NO_SENDER_CONVERSION
125-
setMQIString((*C.char)(&mqcd.SecurityUserData[0]), gocd.SecurityUserData, C.MQ_EXIT_DATA_LENGTH)
126-
setMQIString((*C.char)(&mqcd.MsgUserData[0]), "", C.MQ_EXIT_DATA_LENGTH)
127-
setMQIString((*C.char)(&mqcd.SendUserData[0]), "", C.MQ_EXIT_DATA_LENGTH)
128-
setMQIString((*C.char)(&mqcd.ReceiveUserData[0]), "", C.MQ_EXIT_DATA_LENGTH)
129-
setMQIString((*C.char)(&mqcd.UserIdentifier[0]), "", C.MQ_USER_ID_LENGTH)
130-
setMQIString((*C.char)(&mqcd.Password[0]), "", C.MQ_PASSWORD_LENGTH)
131-
setMQIString((*C.char)(&mqcd.MCAUserIdentifier[0]), "", C.MQ_USER_ID_LENGTH)
132-
mqcd.MCAType = C.MQMCAT_PROCESS
133-
setMQIString((*C.char)(&mqcd.ConnectionName[0]), gocd.ConnectionName, C.MQ_CONN_NAME_LENGTH)
134-
setMQIString((*C.char)(&mqcd.RemoteUserIdentifier[0]), "", C.MQ_USER_ID_LENGTH)
135-
setMQIString((*C.char)(&mqcd.RemotePassword[0]), "", C.MQ_PASSWORD_LENGTH)
136-
setMQIString((*C.char)(&mqcd.MsgRetryExit[0]), "", C.MQ_EXIT_NAME_LENGTH)
137-
setMQIString((*C.char)(&mqcd.MsgRetryUserData[0]), "", C.MQ_EXIT_DATA_LENGTH)
138-
mqcd.MsgRetryCount = 10
139-
mqcd.MsgRetryInterval = 1000
140-
mqcd.HeartbeatInterval = 1
141-
mqcd.BatchInterval = 0
142-
mqcd.NonPersistentMsgSpeed = C.MQNPMS_FAST
143-
mqcd.StrucLength = C.MQCD_LENGTH_11
144-
mqcd.ExitNameLength = C.MQ_EXIT_NAME_LENGTH
145-
mqcd.ExitDataLength = C.MQ_EXIT_DATA_LENGTH
146-
mqcd.MsgExitsDefined = 0
147-
mqcd.SendExitsDefined = 0
148-
mqcd.ReceiveExitsDefined = 0
149-
mqcd.MsgExitPtr = C.MQPTR(nil)
150-
mqcd.MsgUserDataPtr = C.MQPTR(nil)
151-
mqcd.SendExitPtr = C.MQPTR(nil)
152-
mqcd.SendUserDataPtr = C.MQPTR(nil)
153-
mqcd.ReceiveExitPtr = C.MQPTR(nil)
154-
mqcd.ReceiveUserDataPtr = C.MQPTR(nil)
155-
mqcd.ClusterPtr = C.MQPTR(nil)
156-
mqcd.ClustersDefined = 0
157-
mqcd.NetworkPriority = 0
158-
mqcd.LongMCAUserIdLength = 0
159-
mqcd.LongRemoteUserIdLength = 0
160-
mqcd.LongMCAUserIdPtr = C.MQPTR(nil)
161-
mqcd.LongRemoteUserIdPtr = C.MQPTR(nil)
162-
C.memset((unsafe.Pointer)(&mqcd.MCASecurityId[0]), 0, C.MQ_SECURITY_ID_LENGTH)
163-
C.memset((unsafe.Pointer)(&mqcd.RemoteSecurityId[0]), 0, C.MQ_SECURITY_ID_LENGTH)
164-
setMQIString((*C.char)(&mqcd.SSLCipherSpec[0]), gocd.SSLCipherSpec, C.MQ_SSL_CIPHER_SPEC_LENGTH)
165-
mqcd.SSLPeerNamePtr = C.MQPTR(nil)
166-
mqcd.SSLPeerNameLength = 0
167-
if gocd.SSLPeerName != "" {
168-
mqcd.SSLPeerNamePtr = C.MQPTR(unsafe.Pointer(C.CString(gocd.SSLPeerName)))
169-
mqcd.SSLPeerNameLength = C.MQLONG(len(gocd.SSLPeerName))
170-
}
171-
mqcd.SSLClientAuth = C.MQLONG(gocd.SSLClientAuth)
172-
mqcd.KeepAliveInterval = C.MQLONG(gocd.KeepAliveInterval)
173-
setMQIString((*C.char)(&mqcd.LocalAddress[0]), "", C.MQ_LOCAL_ADDRESS_LENGTH)
174-
mqcd.BatchHeartbeat = 0
175-
for i := 0; i < 2; i++ {
176-
mqcd.HdrCompList[i] = C.MQCOMPRESS_NOT_AVAILABLE
177-
}
178-
for i := 0; i < 16; i++ {
179-
mqcd.MsgCompList[i] = C.MQCOMPRESS_NOT_AVAILABLE
180-
}
181-
mqcd.CLWLChannelRank = 0
182-
mqcd.CLWLChannelPriority = 0
183-
mqcd.CLWLChannelWeight = 50
184-
mqcd.ChannelMonitoring = C.MQMON_OFF
185-
mqcd.ChannelStatistics = C.MQMON_OFF
186-
mqcd.SharingConversations = C.MQLONG(gocd.SharingConversations)
187-
mqcd.PropertyControl = C.MQLONG(gocd.PropertyControl)
188-
mqcd.MaxInstances = 999999999
189-
mqcd.MaxInstancesPerClient = 999999999
190-
mqcd.ClientChannelWeight = C.MQLONG(gocd.ClientChannelWeight)
191-
mqcd.ConnectionAffinity = C.MQLONG(gocd.ConnectionAffinity)
192-
mqcd.BatchDataLimit = 5000
193-
mqcd.UseDLQ = C.MQUSEDLQ_YES
194-
mqcd.DefReconnect = C.MQLONG(gocd.DefReconnect)
195-
setMQIString((*C.char)(&mqcd.CertificateLabel[0]), gocd.CertificateLabel, C.MQ_CERT_LABEL_LENGTH)
196-
197-
return
100+
setMQIString((*C.char)(&mqcd.ChannelName[0]), gocd.ChannelName, C.MQ_CHANNEL_NAME_LENGTH)
101+
mqcd.Version = C.MQCD_VERSION_11 // The version this is written to match
102+
mqcd.ChannelType = C.MQCHT_CLNTCONN
103+
mqcd.TransportType = C.MQXPT_TCP
104+
setMQIString((*C.char)(&mqcd.Desc[0]), "", C.MQ_CHANNEL_DESC_LENGTH)
105+
setMQIString((*C.char)(&mqcd.QMgrName[0]), "", C.MQ_OBJECT_NAME_LENGTH)
106+
setMQIString((*C.char)(&mqcd.XmitQName[0]), "", C.MQ_OBJECT_NAME_LENGTH)
107+
setMQIString((*C.char)(&mqcd.ShortConnectionName[0]), "", C.MQ_SHORT_CONN_NAME_LENGTH)
108+
setMQIString((*C.char)(&mqcd.MCAName[0]), "", C.MQ_MCA_NAME_LENGTH)
109+
setMQIString((*C.char)(&mqcd.ModeName[0]), "", C.MQ_MODE_NAME_LENGTH)
110+
setMQIString((*C.char)(&mqcd.TpName[0]), "", C.MQ_TP_NAME_LENGTH)
111+
mqcd.BatchSize = 50
112+
mqcd.DiscInterval = 6000
113+
mqcd.ShortRetryCount = 10
114+
mqcd.ShortRetryInterval = 60
115+
mqcd.LongRetryCount = 999999999
116+
mqcd.LongRetryInterval = 1200
117+
setMQIString((*C.char)(&mqcd.SecurityExit[0]), gocd.SecurityExit, C.MQ_EXIT_NAME_LENGTH)
118+
setMQIString((*C.char)(&mqcd.MsgExit[0]), "", C.MQ_EXIT_NAME_LENGTH)
119+
setMQIString((*C.char)(&mqcd.SendExit[0]), "", C.MQ_EXIT_NAME_LENGTH)
120+
setMQIString((*C.char)(&mqcd.ReceiveExit[0]), "", C.MQ_EXIT_NAME_LENGTH)
121+
mqcd.SeqNumberWrap = 999999999
122+
mqcd.MaxMsgLength = C.MQLONG(gocd.MaxMsgLength)
123+
mqcd.PutAuthority = C.MQPA_DEFAULT
124+
mqcd.DataConversion = C.MQCDC_NO_SENDER_CONVERSION
125+
setMQIString((*C.char)(&mqcd.SecurityUserData[0]), gocd.SecurityUserData, C.MQ_EXIT_DATA_LENGTH)
126+
setMQIString((*C.char)(&mqcd.MsgUserData[0]), "", C.MQ_EXIT_DATA_LENGTH)
127+
setMQIString((*C.char)(&mqcd.SendUserData[0]), "", C.MQ_EXIT_DATA_LENGTH)
128+
setMQIString((*C.char)(&mqcd.ReceiveUserData[0]), "", C.MQ_EXIT_DATA_LENGTH)
129+
setMQIString((*C.char)(&mqcd.UserIdentifier[0]), "", C.MQ_USER_ID_LENGTH)
130+
setMQIString((*C.char)(&mqcd.Password[0]), "", C.MQ_PASSWORD_LENGTH)
131+
setMQIString((*C.char)(&mqcd.MCAUserIdentifier[0]), "", C.MQ_USER_ID_LENGTH)
132+
mqcd.MCAType = C.MQMCAT_PROCESS
133+
setMQIString((*C.char)(&mqcd.ConnectionName[0]), gocd.ConnectionName, C.MQ_CONN_NAME_LENGTH)
134+
setMQIString((*C.char)(&mqcd.RemoteUserIdentifier[0]), "", C.MQ_USER_ID_LENGTH)
135+
setMQIString((*C.char)(&mqcd.RemotePassword[0]), "", C.MQ_PASSWORD_LENGTH)
136+
setMQIString((*C.char)(&mqcd.MsgRetryExit[0]), "", C.MQ_EXIT_NAME_LENGTH)
137+
setMQIString((*C.char)(&mqcd.MsgRetryUserData[0]), "", C.MQ_EXIT_DATA_LENGTH)
138+
mqcd.MsgRetryCount = 10
139+
mqcd.MsgRetryInterval = 1000
140+
mqcd.HeartbeatInterval = 1
141+
mqcd.BatchInterval = 0
142+
mqcd.NonPersistentMsgSpeed = C.MQNPMS_FAST
143+
mqcd.StrucLength = C.MQCD_LENGTH_11
144+
mqcd.ExitNameLength = C.MQ_EXIT_NAME_LENGTH
145+
mqcd.ExitDataLength = C.MQ_EXIT_DATA_LENGTH
146+
mqcd.MsgExitsDefined = 0
147+
mqcd.SendExitsDefined = 0
148+
mqcd.ReceiveExitsDefined = 0
149+
mqcd.MsgExitPtr = C.MQPTR(nil)
150+
mqcd.MsgUserDataPtr = C.MQPTR(nil)
151+
mqcd.SendExitPtr = C.MQPTR(nil)
152+
mqcd.SendUserDataPtr = C.MQPTR(nil)
153+
mqcd.ReceiveExitPtr = C.MQPTR(nil)
154+
mqcd.ReceiveUserDataPtr = C.MQPTR(nil)
155+
mqcd.ClusterPtr = C.MQPTR(nil)
156+
mqcd.ClustersDefined = 0
157+
mqcd.NetworkPriority = 0
158+
mqcd.LongMCAUserIdLength = 0
159+
mqcd.LongRemoteUserIdLength = 0
160+
mqcd.LongMCAUserIdPtr = C.MQPTR(nil)
161+
mqcd.LongRemoteUserIdPtr = C.MQPTR(nil)
162+
C.memset((unsafe.Pointer)(&mqcd.MCASecurityId[0]), 0, C.MQ_SECURITY_ID_LENGTH)
163+
C.memset((unsafe.Pointer)(&mqcd.RemoteSecurityId[0]), 0, C.MQ_SECURITY_ID_LENGTH)
164+
setMQIString((*C.char)(&mqcd.SSLCipherSpec[0]), gocd.SSLCipherSpec, C.MQ_SSL_CIPHER_SPEC_LENGTH)
165+
mqcd.SSLPeerNamePtr = C.MQPTR(nil)
166+
mqcd.SSLPeerNameLength = 0
167+
if gocd.SSLPeerName != "" {
168+
mqcd.SSLPeerNamePtr = C.MQPTR(unsafe.Pointer(C.CString(gocd.SSLPeerName)))
169+
mqcd.SSLPeerNameLength = C.MQLONG(len(gocd.SSLPeerName))
170+
}
171+
mqcd.SSLClientAuth = C.MQLONG(gocd.SSLClientAuth)
172+
mqcd.KeepAliveInterval = C.MQLONG(gocd.KeepAliveInterval)
173+
setMQIString((*C.char)(&mqcd.LocalAddress[0]), "", C.MQ_LOCAL_ADDRESS_LENGTH)
174+
mqcd.BatchHeartbeat = 0
175+
for i := 0; i < 2; i++ {
176+
mqcd.HdrCompList[i] = C.MQCOMPRESS_NOT_AVAILABLE
177+
}
178+
for i := 0; i < 16; i++ {
179+
mqcd.MsgCompList[i] = C.MQCOMPRESS_NOT_AVAILABLE
180+
}
181+
mqcd.CLWLChannelRank = 0
182+
mqcd.CLWLChannelPriority = 0
183+
mqcd.CLWLChannelWeight = 50
184+
mqcd.ChannelMonitoring = C.MQMON_OFF
185+
mqcd.ChannelStatistics = C.MQMON_OFF
186+
mqcd.SharingConversations = C.MQLONG(gocd.SharingConversations)
187+
mqcd.PropertyControl = C.MQLONG(gocd.PropertyControl)
188+
mqcd.MaxInstances = 999999999
189+
mqcd.MaxInstancesPerClient = 999999999
190+
mqcd.ClientChannelWeight = C.MQLONG(gocd.ClientChannelWeight)
191+
mqcd.ConnectionAffinity = C.MQLONG(gocd.ConnectionAffinity)
192+
mqcd.BatchDataLimit = 5000
193+
mqcd.UseDLQ = C.MQUSEDLQ_YES
194+
mqcd.DefReconnect = C.MQLONG(gocd.DefReconnect)
195+
setMQIString((*C.char)(&mqcd.CertificateLabel[0]), gocd.CertificateLabel, C.MQ_CERT_LABEL_LENGTH)
196+
197+
return
198198
}
199199

200200
/*
@@ -203,9 +203,9 @@ Just need to clear up anything that was allocated in the copyCDtoC function
203203
*/
204204
func copyCDfromC(mqcd *C.MQCD, gocd *MQCD) {
205205

206-
if mqcd.SSLPeerNamePtr != nil {
207-
C.free(unsafe.Pointer(mqcd.SSLPeerNamePtr))
208-
}
206+
if mqcd.SSLPeerNamePtr != nil {
207+
C.free(unsafe.Pointer(mqcd.SSLPeerNamePtr))
208+
}
209209

210-
return
210+
return
211211
}

0 commit comments

Comments
 (0)