vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-04 03:29:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up dsd package

Browse source
This commit is contained in:
Daniel 2019-09-20 22:01:59 +02:00
parent 7011bde0fe
commit e5961b9368
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
formats/dsd/dsd.go
View file

@ -25,7 +25,6 @@ const (
// define errors // define errors
var errNoMoreSpace = errors.New("dsd: no more space left after reading dsd type") var errNoMoreSpace = errors.New("dsd: no more space left after reading dsd type")
var errUnknownType = errors.New("dsd: tried to unpack unknown type")
var errNotImplemented = errors.New("dsd: this type is not yet implemented") var errNotImplemented = errors.New("dsd: this type is not yet implemented")
// Load loads an dsd structured data blob into the given interface. // Load loads an dsd structured data blob into the given interface.
@ -58,7 +57,8 @@ func LoadAsFormat(data []byte, format uint8, t interface{}) (interface{}, error)
return nil, fmt.Errorf("dsd: failed to unpack json data: %s", data) return nil, fmt.Errorf("dsd: failed to unpack json data: %s", data)
} }
return t, nil return t, nil
// case BSON: case BSON:
return nil, errNotImplemented
// err := bson.Unmarshal(data[read:], t) // err := bson.Unmarshal(data[read:], t)
// if err != nil { // if err != nil {
// return nil, err // return nil, err
@ -92,7 +92,7 @@ func Dump(t interface{}, format uint8) ([]byte, error) {
} }
} }
f := varint.Pack8(uint8(format)) f := varint.Pack8(format)
var data []byte var data []byte
var err error var err error
switch format { switch format {
@ -106,7 +106,8 @@ func Dump(t interface{}, format uint8) ([]byte, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// case BSON: case BSON:
return nil, errNotImplemented
// data, err = bson.Marshal(t) // data, err = bson.Marshal(t)
// if err != nil { // if err != nil {
// return nil, err // return nil, err

4
formats/dsd/dsd_test.go
View file

@ -1,3 +1,4 @@
//nolint:maligned,unparam,gocyclo
package dsd package dsd
import ( import (
@ -97,8 +98,7 @@ func TestConversion(t *testing.T) {
} }
bString := "b" bString := "b"
var bBytes byte var bBytes byte = 0x02
bBytes = 0x02
complexSubject := ComplexTestStruct{ complexSubject := ComplexTestStruct{
-1, -1,

1
formats/dsd/gencode_test.go
View file

@ -1,3 +1,4 @@
//nolint:nakedret,unconvert
package dsd package dsd
import ( import (