From 2a006cc83a9e49472d5e8e899b51c9417b6c867a Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Fri, 27 Jun 2014 16:05:01 -0500 Subject: [PATCH] Clean up interface pointer ID handling. --- rpcserver.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpcserver.go b/rpcserver.go index b85eb5a..a543d2a 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -785,12 +785,12 @@ func (s *rpcServer) PostClientRPC(w http.ResponseWriter, r *http.Request) { // Parse the full request since it must be handled by wallet. cmd, err := btcjson.ParseMarshaledCmd(rpcRequest) - var id interface{} + var idPtr *interface{} if cmd != nil { - id = cmd.Id() + idPtr = idPointer(cmd.Id()) } if err != nil { - _, err := w.Write(marshalError(idPointer(cmd.Id()))) + _, err := w.Write(marshalError(idPtr)) if err != nil { log.Warnf("Client sent invalid request but unable "+ "to respond with error: %v", err) @@ -821,7 +821,7 @@ func (s *rpcServer) PostClientRPC(w http.ResponseWriter, r *http.Request) { return } resp := btcjson.Reply{ - Id: idPointer(id), + Id: idPtr, Result: response.result, Error: response.jsonErr, }