From 2f34f145350340409f5c9c947acaeb910a0acf93 Mon Sep 17 00:00:00 2001 From: Sebastien Binet Date: Mon, 3 Aug 2015 14:24:10 +0200 Subject: [PATCH] bind: cosmetics Change-Id: I6f223468cb4b9614b749e60bca041e58e2518ff9 --- bind/gengo.go | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/bind/gengo.go b/bind/gengo.go index 15c845e..ef7cf37 100644 --- a/bind/gengo.go +++ b/bind/gengo.go @@ -37,7 +37,7 @@ var _ = unsafe.Pointer(nil) // --- begin cgo helpers --- //export CGoPy_GoString -func CGoPy_GoString(str *C.char) string { +func CGoPy_GoString(str *C.char) string { return C.GoString(str) } @@ -175,12 +175,7 @@ func (g *goGen) genFunc(f Func) { sig := f.Signature() params := "(" + g.tupleString(sig.Params()) + ")" - ret := g.tupleString(sig.Results()) - if len(sig.Results()) > 1 { - ret = "(" + ret + ") " - } else { - ret += " " - } + ret := " (" + g.tupleString(sig.Results()) + ") " //funcName := o.Name() g.Printf(` @@ -354,13 +349,7 @@ func (g *goGen) genMethod(s Struct, m Func) { params += ", " + g.tupleString(sig.Params()) } params += ")" - - ret := g.tupleString(sig.Results()) - if len(sig.Results()) > 1 { - ret = "(" + ret + ")" - } else { - ret += " " - } + ret := " (" + g.tupleString(sig.Results()) + ") " g.Printf("//export GoPy_%[1]s\n", m.ID()) g.Printf("func GoPy_%[1]s%[2]s%[3]s{\n",