From 58da9ac6e691a8c660eb8ca838a154e11da0db68 Mon Sep 17 00:00:00 2001 From: Ondrej Fabry Date: Wed, 22 Jul 2020 04:40:55 +0200 Subject: Fix binapigen decoding and minor improvements - fixed allocating byte slices before copying decoded data - simplified encoding functions - several minor improvements Change-Id: I6669424b89eb86333805cb1b57e4551169980cc2 Signed-off-by: Ondrej Fabry --- binapi/http_static/http_static.ba.go | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'binapi/http_static') diff --git a/binapi/http_static/http_static.ba.go b/binapi/http_static/http_static.ba.go index c1338ed..2116a8b 100644 --- a/binapi/http_static/http_static.ba.go +++ b/binapi/http_static/http_static.ba.go @@ -45,11 +45,10 @@ func (*HTTPStaticEnable) GetMessageType() api.MessageType { return api.RequestMessage } -func (m *HTTPStaticEnable) Size() int { +func (m *HTTPStaticEnable) Size() (size int) { if m == nil { return 0 } - var size int size += 4 // m.FifoSize size += 4 // m.CacheSizeLimit size += 4 // m.PreallocFifos @@ -59,16 +58,14 @@ func (m *HTTPStaticEnable) Size() int { return size } func (m *HTTPStaticEnable) Marshal(b []byte) ([]byte, error) { - var buf *codec.Buffer if b == nil { - buf = codec.NewBuffer(make([]byte, m.Size())) - } else { - buf = codec.NewBuffer(b) + b = make([]byte, m.Size()) } - buf.EncodeUint32(uint32(m.FifoSize)) - buf.EncodeUint32(uint32(m.CacheSizeLimit)) - buf.EncodeUint32(uint32(m.PreallocFifos)) - buf.EncodeUint32(uint32(m.PrivateSegmentSize)) + buf := codec.NewBuffer(b) + buf.EncodeUint32(m.FifoSize) + buf.EncodeUint32(m.CacheSizeLimit) + buf.EncodeUint32(m.PreallocFifos) + buf.EncodeUint32(m.PrivateSegmentSize) buf.EncodeString(m.WwwRoot, 256) buf.EncodeString(m.URI, 256) return buf.Bytes(), nil @@ -96,27 +93,24 @@ func (*HTTPStaticEnableReply) GetMessageType() api.MessageType { return api.ReplyMessage } -func (m *HTTPStaticEnableReply) Size() int { +func (m *HTTPStaticEnableReply) Size() (size int) { if m == nil { return 0 } - var size int size += 4 // m.Retval return size } func (m *HTTPStaticEnableReply) Marshal(b []byte) ([]byte, error) { - var buf *codec.Buffer if b == nil { - buf = codec.NewBuffer(make([]byte, m.Size())) - } else { - buf = codec.NewBuffer(b) + b = make([]byte, m.Size()) } - buf.EncodeUint32(uint32(m.Retval)) + buf := codec.NewBuffer(b) + buf.EncodeInt32(m.Retval) return buf.Bytes(), nil } func (m *HTTPStaticEnableReply) Unmarshal(b []byte) error { buf := codec.NewBuffer(b) - m.Retval = int32(buf.DecodeUint32()) + m.Retval = buf.DecodeInt32() return nil } -- cgit 1.2.3-korg