cyrilix/goupnp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove spurious spaces from between req/resp struct members in generated code.

Browse Source
This commit is contained in:
John Beisley 2017-11-05 13:50:25 +00:00
parent 8087be8632
commit 29fc54a4c0
4 changed files with 461 additions and 942 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

281
dcps/av1/av1.go
View File

File diff suppressed because it is too large Load Diff

68
dcps/internetgateway1/internetgateway1.go
View File

@ -390,7 +390,6 @@ func (client *LANHostConfigManagement1) SetAddressRange(NewMinAddress string, Ne
// Request structure.
request := &struct {
NewMinAddress string
NewMaxAddress string
}{}
// BEGIN Marshal arguments into request.
@ -427,7 +426,6 @@ func (client *LANHostConfigManagement1) GetAddressRange() (NewMinAddress string,
// Response structure.
response := &struct {
NewMinAddress string
NewMaxAddress string
}{}
@ -792,7 +790,6 @@ func (client *WANCableLinkConfig1) GetCableLinkConfigInfo() (NewCableLinkConfigS
// Response structure.
response := &struct {
NewCableLinkConfigState string
NewLinkType string
}{}
@ -1183,11 +1180,8 @@ func (client *WANCommonInterfaceConfig1) GetCommonLinkProperties() (NewWANAccess
// Response structure.
response := &struct {
NewWANAccessType string
NewLayer1UpstreamMaxBitRate string
NewLayer1DownstreamMaxBitRate string
NewPhysicalLinkStatus string
}{}
@ -1389,7 +1383,6 @@ func (client *WANCommonInterfaceConfig1) GetActiveConnection(NewActiveConnection
// Response structure.
response := &struct {
NewActiveConnDeviceContainer string
NewActiveConnectionServiceID string
}{}
@ -1510,7 +1503,6 @@ func (client *WANDSLLinkConfig1) GetDSLLinkInfo() (NewLinkType string, NewLinkSt
// Response structure.
response := &struct {
NewLinkType string
NewLinkStatus string
}{}
@ -1929,7 +1921,6 @@ func (client *WANIPConnection1) GetConnectionTypeInfo() (NewConnectionType strin
// Response structure.
response := &struct {
NewConnectionType string
NewPossibleConnectionTypes string
}{}
@ -2107,9 +2098,7 @@ func (client *WANIPConnection1) GetStatusInfo() (NewConnectionStatus string, New
// Response structure.
response := &struct {
NewConnectionStatus string
NewLastConnectionError string
NewUptime string
}{}
@ -2221,7 +2210,6 @@ func (client *WANIPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNA
// Response structure.
response := &struct {
NewRSIPAvailable string
NewNATEnabled string
}{}
@ -2261,19 +2249,12 @@ func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex u
// Response structure.
response := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -2321,9 +2302,7 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.
@ -2342,13 +2321,9 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
// Response structure.
response := &struct {
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -2387,19 +2362,12 @@ func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternal
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
// BEGIN Marshal arguments into request.
@ -2453,9 +2421,7 @@ func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExter
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.
@ -2580,9 +2546,7 @@ func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInf
// Request structure.
request := &struct {
NewISPPhoneNumber string
NewISPInfo string
NewLinkType string
}{}
// BEGIN Marshal arguments into request.
@ -2616,7 +2580,6 @@ func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, Ne
// Request structure.
request := &struct {
NewNumberOfRetries string
NewDelayBetweenRetries string
}{}
// BEGIN Marshal arguments into request.
@ -2657,9 +2620,7 @@ func (client *WANPOTSLinkConfig1) GetISPInfo() (NewISPPhoneNumber string, NewISP
// Response structure.
response := &struct {
NewISPPhoneNumber string
NewISPInfo string
NewLinkType string
}{}
@ -2693,7 +2654,6 @@ func (client *WANPOTSLinkConfig1) GetCallRetryInfo() (NewNumberOfRetries uint32,
// Response structure.
response := &struct {
NewNumberOfRetries string
NewDelayBetweenRetries string
}{}
@ -2944,7 +2904,6 @@ func (client *WANPPPConnection1) GetConnectionTypeInfo() (NewConnectionType stri
// Response structure.
response := &struct {
NewConnectionType string
NewPossibleConnectionTypes string
}{}
@ -2969,7 +2928,6 @@ func (client *WANPPPConnection1) ConfigureConnection(NewUserName string, NewPass
// Request structure.
request := &struct {
NewUserName string
NewPassword string
}{}
// BEGIN Marshal arguments into request.
@ -3153,9 +3111,7 @@ func (client *WANPPPConnection1) GetStatusInfo() (NewConnectionStatus string, Ne
// Response structure.
response := &struct {
NewConnectionStatus string
NewLastConnectionError string
NewUptime string
}{}
@ -3189,7 +3145,6 @@ func (client *WANPPPConnection1) GetLinkLayerMaxBitRates() (NewUpstreamMaxBitRat
// Response structure.
response := &struct {
NewUpstreamMaxBitRate string
NewDownstreamMaxBitRate string
}{}
@ -3428,7 +3383,6 @@ func (client *WANPPPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewN
// Response structure.
response := &struct {
NewRSIPAvailable string
NewNATEnabled string
}{}
@ -3468,19 +3422,12 @@ func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex
// Response structure.
response := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -3528,9 +3475,7 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.
@ -3549,13 +3494,9 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
// Response structure.
response := &struct {
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -3594,19 +3535,12 @@ func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExterna
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
// BEGIN Marshal arguments into request.
@ -3660,9 +3594,7 @@ func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExte
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.

132
dcps/internetgateway2/internetgateway2.go
View File

@ -109,7 +109,6 @@ func (client *DeviceProtection1) SendSetupMessage(ProtocolType string, InMessage
// Request structure.
request := &struct {
ProtocolType string
InMessage string
}{}
// BEGIN Marshal arguments into request.
@ -197,9 +196,7 @@ func (client *DeviceProtection1) GetRolesForAction(DeviceUDN string, ServiceId s
// Request structure.
request := &struct {
DeviceUDN string
ServiceId string
ActionName string
}{}
// BEGIN Marshal arguments into request.
@ -218,7 +215,6 @@ func (client *DeviceProtection1) GetRolesForAction(DeviceUDN string, ServiceId s
// Response structure.
response := &struct {
RoleList string
RestrictedRoleList string
}{}
@ -243,7 +239,6 @@ func (client *DeviceProtection1) GetUserLoginChallenge(ProtocolType string, Name
// Request structure.
request := &struct {
ProtocolType string
Name string
}{}
// BEGIN Marshal arguments into request.
@ -259,7 +254,6 @@ func (client *DeviceProtection1) GetUserLoginChallenge(ProtocolType string, Name
// Response structure.
response := &struct {
Salt string
Challenge string
}{}
@ -284,9 +278,7 @@ func (client *DeviceProtection1) UserLogin(ProtocolType string, Challenge []byte
// Request structure.
request := &struct {
ProtocolType string
Challenge string
Authenticator string
}{}
// BEGIN Marshal arguments into request.
@ -424,11 +416,8 @@ func (client *DeviceProtection1) SetUserLoginPassword(ProtocolType string, Name
// Request structure.
request := &struct {
ProtocolType string
Name string
Stored string
Salt string
}{}
// BEGIN Marshal arguments into request.
@ -465,7 +454,6 @@ func (client *DeviceProtection1) AddRolesForIdentity(Identity string, RoleList s
// Request structure.
request := &struct {
Identity string
RoleList string
}{}
// BEGIN Marshal arguments into request.
@ -496,7 +484,6 @@ func (client *DeviceProtection1) RemoveRolesForIdentity(Identity string, RoleLis
// Request structure.
request := &struct {
Identity string
RoleList string
}{}
// BEGIN Marshal arguments into request.
@ -873,7 +860,6 @@ func (client *LANHostConfigManagement1) SetAddressRange(NewMinAddress string, Ne
// Request structure.
request := &struct {
NewMinAddress string
NewMaxAddress string
}{}
// BEGIN Marshal arguments into request.
@ -910,7 +896,6 @@ func (client *LANHostConfigManagement1) GetAddressRange() (NewMinAddress string,
// Response structure.
response := &struct {
NewMinAddress string
NewMaxAddress string
}{}
@ -1275,7 +1260,6 @@ func (client *WANCableLinkConfig1) GetCableLinkConfigInfo() (NewCableLinkConfigS
// Response structure.
response := &struct {
NewCableLinkConfigState string
NewLinkType string
}{}
@ -1666,11 +1650,8 @@ func (client *WANCommonInterfaceConfig1) GetCommonLinkProperties() (NewWANAccess
// Response structure.
response := &struct {
NewWANAccessType string
NewLayer1UpstreamMaxBitRate string
NewLayer1DownstreamMaxBitRate string
NewPhysicalLinkStatus string
}{}
@ -1872,7 +1853,6 @@ func (client *WANCommonInterfaceConfig1) GetActiveConnection(NewActiveConnection
// Response structure.
response := &struct {
NewActiveConnDeviceContainer string
NewActiveConnectionServiceID string
}{}
@ -1993,7 +1973,6 @@ func (client *WANDSLLinkConfig1) GetDSLLinkInfo() (NewLinkType string, NewLinkSt
// Response structure.
response := &struct {
NewLinkType string
NewLinkStatus string
}{}
@ -2412,7 +2391,6 @@ func (client *WANIPConnection1) GetConnectionTypeInfo() (NewConnectionType strin
// Response structure.
response := &struct {
NewConnectionType string
NewPossibleConnectionTypes string
}{}
@ -2590,9 +2568,7 @@ func (client *WANIPConnection1) GetStatusInfo() (NewConnectionStatus string, New
// Response structure.
response := &struct {
NewConnectionStatus string
NewLastConnectionError string
NewUptime string
}{}
@ -2704,7 +2680,6 @@ func (client *WANIPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNA
// Response structure.
response := &struct {
NewRSIPAvailable string
NewNATEnabled string
}{}
@ -2744,19 +2719,12 @@ func (client *WANIPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex u
// Response structure.
response := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -2804,9 +2772,7 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.
@ -2825,13 +2791,9 @@ func (client *WANIPConnection1) GetSpecificPortMappingEntry(NewRemoteHost string
// Response structure.
response := &struct {
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -2870,19 +2832,12 @@ func (client *WANIPConnection1) AddPortMapping(NewRemoteHost string, NewExternal
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
// BEGIN Marshal arguments into request.
@ -2936,9 +2891,7 @@ func (client *WANIPConnection1) DeletePortMapping(NewRemoteHost string, NewExter
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.
@ -3090,7 +3043,6 @@ func (client *WANIPConnection2) GetConnectionTypeInfo() (NewConnectionType strin
// Response structure.
response := &struct {
NewConnectionType string
NewPossibleConnectionTypes string
}{}
@ -3268,9 +3220,7 @@ func (client *WANIPConnection2) GetStatusInfo() (NewConnectionStatus string, New
// Response structure.
response := &struct {
NewConnectionStatus string
NewLastConnectionError string
NewUptime string
}{}
@ -3382,7 +3332,6 @@ func (client *WANIPConnection2) GetNATRSIPStatus() (NewRSIPAvailable bool, NewNA
// Response structure.
response := &struct {
NewRSIPAvailable string
NewNATEnabled string
}{}
@ -3422,19 +3371,12 @@ func (client *WANIPConnection2) GetGenericPortMappingEntry(NewPortMappingIndex u
// Response structure.
response := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -3482,9 +3424,7 @@ func (client *WANIPConnection2) GetSpecificPortMappingEntry(NewRemoteHost string
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.
@ -3503,13 +3443,9 @@ func (client *WANIPConnection2) GetSpecificPortMappingEntry(NewRemoteHost string
// Response structure.
response := &struct {
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -3548,19 +3484,12 @@ func (client *WANIPConnection2) AddPortMapping(NewRemoteHost string, NewExternal
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
// BEGIN Marshal arguments into request.
@ -3614,9 +3543,7 @@ func (client *WANIPConnection2) DeletePortMapping(NewRemoteHost string, NewExter
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.
@ -3655,11 +3582,8 @@ func (client *WANIPConnection2) DeletePortMappingRange(NewStartPort uint16, NewE
// Request structure.
request := &struct {
NewStartPort string
NewEndPort string
NewProtocol string
NewManage string
}{}
// BEGIN Marshal arguments into request.
@ -3727,13 +3651,9 @@ func (client *WANIPConnection2) GetListOfPortMappings(NewStartPort uint16, NewEn
// Request structure.
request := &struct {
NewStartPort string
NewEndPort string
NewProtocol string
NewManage string
NewNumberOfPorts string
}{}
// BEGIN Marshal arguments into request.
@ -3783,19 +3703,12 @@ func (client *WANIPConnection2) AddAnyPortMapping(NewRemoteHost string, NewExter
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
// BEGIN Marshal arguments into request.
@ -3915,7 +3828,6 @@ func (client *WANIPv6FirewallControl1) GetFirewallStatus() (FirewallEnabled bool
// Response structure.
response := &struct {
FirewallEnabled string
InboundPinholeAllowed string
}{}
@ -3940,13 +3852,9 @@ func (client *WANIPv6FirewallControl1) GetOutboundPinholeTimeout(RemoteHost stri
// Request structure.
request := &struct {
RemoteHost string
RemotePort string
InternalClient string
InternalPort string
Protocol string
}{}
// BEGIN Marshal arguments into request.
@ -3996,15 +3904,10 @@ func (client *WANIPv6FirewallControl1) AddPinhole(RemoteHost string, RemotePort
// Request structure.
request := &struct {
RemoteHost string
RemotePort string
InternalClient string
InternalPort string
Protocol string
LeaseTime string
}{}
// BEGIN Marshal arguments into request.
@ -4057,7 +3960,6 @@ func (client *WANIPv6FirewallControl1) UpdatePinhole(UniqueID uint16, NewLeaseTi
// Request structure.
request := &struct {
UniqueID string
NewLeaseTime string
}{}
// BEGIN Marshal arguments into request.
@ -4241,9 +4143,7 @@ func (client *WANPOTSLinkConfig1) SetISPInfo(NewISPPhoneNumber string, NewISPInf
// Request structure.
request := &struct {
NewISPPhoneNumber string
NewISPInfo string
NewLinkType string
}{}
// BEGIN Marshal arguments into request.
@ -4277,7 +4177,6 @@ func (client *WANPOTSLinkConfig1) SetCallRetryInfo(NewNumberOfRetries uint32, Ne
// Request structure.
request := &struct {
NewNumberOfRetries string
NewDelayBetweenRetries string
}{}
// BEGIN Marshal arguments into request.
@ -4318,9 +4217,7 @@ func (client *WANPOTSLinkConfig1) GetISPInfo() (NewISPPhoneNumber string, NewISP
// Response structure.
response := &struct {
NewISPPhoneNumber string
NewISPInfo string
NewLinkType string
}{}
@ -4354,7 +4251,6 @@ func (client *WANPOTSLinkConfig1) GetCallRetryInfo() (NewNumberOfRetries uint32,
// Response structure.
response := &struct {
NewNumberOfRetries string
NewDelayBetweenRetries string
}{}
@ -4605,7 +4501,6 @@ func (client *WANPPPConnection1) GetConnectionTypeInfo() (NewConnectionType stri
// Response structure.
response := &struct {
NewConnectionType string
NewPossibleConnectionTypes string
}{}
@ -4630,7 +4525,6 @@ func (client *WANPPPConnection1) ConfigureConnection(NewUserName string, NewPass
// Request structure.
request := &struct {
NewUserName string
NewPassword string
}{}
// BEGIN Marshal arguments into request.
@ -4814,9 +4708,7 @@ func (client *WANPPPConnection1) GetStatusInfo() (NewConnectionStatus string, Ne
// Response structure.
response := &struct {
NewConnectionStatus string
NewLastConnectionError string
NewUptime string
}{}
@ -4850,7 +4742,6 @@ func (client *WANPPPConnection1) GetLinkLayerMaxBitRates() (NewUpstreamMaxBitRat
// Response structure.
response := &struct {
NewUpstreamMaxBitRate string
NewDownstreamMaxBitRate string
}{}
@ -5089,7 +4980,6 @@ func (client *WANPPPConnection1) GetNATRSIPStatus() (NewRSIPAvailable bool, NewN
// Response structure.
response := &struct {
NewRSIPAvailable string
NewNATEnabled string
}{}
@ -5129,19 +5019,12 @@ func (client *WANPPPConnection1) GetGenericPortMappingEntry(NewPortMappingIndex
// Response structure.
response := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -5189,9 +5072,7 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.
@ -5210,13 +5091,9 @@ func (client *WANPPPConnection1) GetSpecificPortMappingEntry(NewRemoteHost strin
// Response structure.
response := &struct {
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
@ -5255,19 +5132,12 @@ func (client *WANPPPConnection1) AddPortMapping(NewRemoteHost string, NewExterna
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
NewInternalPort string
NewInternalClient string
NewEnabled string
NewPortMappingDescription string
NewLeaseDuration string
}{}
// BEGIN Marshal arguments into request.
@ -5321,9 +5191,7 @@ func (client *WANPPPConnection1) DeletePortMapping(NewRemoteHost string, NewExte
// Request structure.
request := &struct {
NewRemoteHost string
NewExternalPort string
NewProtocol string
}{}
// BEGIN Marshal arguments into request.

4
gotasks/specgen_task.go
View File

@ -620,7 +620,7 @@ func (client *{{$srvIdent}}) {{.Name}}({{range $winargs -}}
{{end}}
{{end}}
{{define "argstruct"}}struct {{"{"}}{{range .}}
{{.Name}} string
{{define "argstruct"}}struct {{"{"}}
{{range .}}{{.Name}} string
{{end}}{{"}"}}{{end}}
`))