From: Nathan Fiscaletti <nate.fiscaletti@gmail.com>
Date: Sat, 7 Mar 2020 05:44:31 +0000 (+0000)
Subject: cmd/cgo: avoid extra newline in doc comment of exported function
X-Git-Tag: go1.15beta1~923
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a7f918c1a596d691da5839b3b1f29dd9c674bfb8;p=gostls13.git

cmd/cgo: avoid extra newline in doc comment of exported function

Fixes #37722

Change-Id: Ie9154f9d91824558a8ac34ad2fb5bc4e02c64a4b
GitHub-Last-Rev: 9fbe1c1d802287ff3c3ccee62e4e74d802196ffb
GitHub-Pull-Request: golang/go#37723
Reviewed-on: https://go-review.googlesource.com/c/go/+/222419
Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

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")