a
/
zlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix needed after calling encoder via interface (#60)

This commit is contained in:
Ravi Raju 2018-05-10 18:21:30 -07:00 committed by Olivier Poitrey
parent ea1184be2b
commit 533ee32d5d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cbor/string.go
View File

@ -45,7 +45,7 @@ func (Encoder) AppendBytes(dst, s []byte) []byte {
} }
// AppendEmbeddedJSON adds a tag and embeds input JSON as such. // AppendEmbeddedJSON adds a tag and embeds input JSON as such.
func (Encoder) AppendEmbeddedJSON(dst, s []byte) []byte { func AppendEmbeddedJSON(dst, s []byte) []byte {
major := majorTypeTags major := majorTypeTags
minor := additionalTypeEmbeddedJSON minor := additionalTypeEmbeddedJSON

6
internal/cbor/types.go
View File

@ -24,7 +24,9 @@ func (Encoder) AppendEndMarker(dst []byte) []byte {
// AppendObjectData takes an object in form of a byte array and appends to dst. // AppendObjectData takes an object in form of a byte array and appends to dst.
func (Encoder) AppendObjectData(dst []byte, o []byte) []byte { func (Encoder) AppendObjectData(dst []byte, o []byte) []byte {
return append(dst, o...) // BeginMarker is present in the dst, which
// should not be copied when appending to existing data.
return append(dst, o[1:]...)
} }
// AppendArrayStart adds markers to indicate the start of an array. // AppendArrayStart adds markers to indicate the start of an array.
@ -434,7 +436,7 @@ func (e Encoder) AppendInterface(dst []byte, i interface{}) []byte {
if err != nil { if err != nil {
return e.AppendString(dst, fmt.Sprintf("marshaling error: %v", err)) return e.AppendString(dst, fmt.Sprintf("marshaling error: %v", err))
} }
return e.AppendEmbeddedJSON(dst, marshaled) return AppendEmbeddedJSON(dst, marshaled)
} }
// AppendIPAddr encodes and inserts an IP Address (IPv4 or IPv6). // AppendIPAddr encodes and inserts an IP Address (IPv4 or IPv6).