opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-02 03:28:25 +08:00
Code Issues Projects Releases Wiki Activity

cmd2: Marshaller -> Marshaler (see golang/encoding)

Browse Source 
Also:
- map[cmds.EncodingType]cmds.Marshaller -> MarshalMap

cc @mappum @maybebtc
This commit is contained in:
Juan Batiz-Benet
2014-11-13 01:05:44 -08:00
parent 0f7757c6fa
commit 047d2e2d62
19 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
commands/response.go
View File

@ -40,7 +40,7 @@ const (
// TODO: support more encoding types
)
var marshallers = map[EncodingType]Marshaller{
var marshallers = map[EncodingType]Marshaler{
JSON: func(res Response) ([]byte, error) {
if res.Error() != nil {
return json.MarshalIndent(res.Error(), "", " ")
@ -69,7 +69,7 @@ type Response interface {
Output() interface{}
// Marshal marshals out the response into a buffer. It uses the EncodingType
// on the Request to chose a Marshaller (Codec).
// on the Request to chose a Marshaler (Codec).
Marshal() ([]byte, error)
// Gets a io.Reader that reads the marshalled output
@ -122,9 +122,9 @@ func (r *response) Marshal() ([]byte, error) {
return []byte(r.Error().Error()), nil
}
var marshaller Marshaller
if r.req.Command() != nil && r.req.Command().Marshallers != nil {
marshaller = r.req.Command().Marshallers[encType]
var marshaller Marshaler
if r.req.Command() != nil && r.req.Command().Marshalers != nil {
marshaller = r.req.Command().Marshalers[encType]
}
if marshaller == nil {
var ok bool