From 9fbe1c1d802287ff3c3ccee62e4e74d802196ffb Mon Sep 17 00:00:00 2001 From: Nathan Fiscaletti Date: Fri, 6 Mar 2020 17:20:23 -0600 Subject: [PATCH] cmd/cgo: removes new line for exported functions removes an unnecessary new line that was being added between a cgo exported function and it's documentation block in the generated header file when the documentation block already ended with a new line Fixes #37722 --- src/cmd/cgo/out.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go index e32a3a607b..6c4c4ae9b3 100644 --- a/src/cmd/cgo/out.go +++ b/src/cmd/cgo/out.go @@ -921,8 +921,11 @@ func (p *Package) writeExports(fgo2, fm, fgcc, fgcch io.Writer) { if len(exp.Doc) > 0 { fmt.Fprintf(fgcch, "\n%s", exp.Doc) + if !strings.HasSuffix(exp.Doc, "\n") { + fmt.Fprint(fgcch, "\n") + } } - fmt.Fprintf(fgcch, "\nextern %s;\n", s) + fmt.Fprintf(fgcch, "extern %s;\n", s) fmt.Fprintf(fgcc, "extern void _cgoexp%s_%s(void *, int, __SIZE_TYPE__);\n", cPrefix, exp.ExpName) fmt.Fprintf(fgcc, "\nCGO_NO_SANITIZE_THREAD")