cgo: note that CString result must be freed

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/4968054

diff --git a/src/cmd/cgo/doc.go b/src/cmd/cgo/doc.go
index 63413825af59dfae9ddf3b907fccce9f4f4c01fc..cc608f40c26c43c18ec1d4847757bcc29ca46ba9 100644 (file)
--- a/src/cmd/cgo/doc.go
+++ b/src/cmd/cgo/doc.go
@@ -72,7 +72,7 @@ the pointer to the first element explicitly: C.f(&x[0]).
 A few special functions convert between Go and C types
 by making copies of the data.  In pseudo-Go definitions:
 
-       // Go string to C string
+       // Go string to C string - result is not garbage collected
        func C.CString(string) *C.char
 
        // C string to Go string

diff --git a/src/pkg/runtime/cgo/util.c b/src/pkg/runtime/cgo/util.c
index 9d96521f53ffceaa42af0503e1e1bcb4fc8b7357..e06b6f64d99314b44de4ce42eec3b6b87c25c2d1 100644 (file)
--- a/src/pkg/runtime/cgo/util.c
+++ b/src/pkg/runtime/cgo/util.c
@@ -18,7 +18,7 @@ x_cgo_malloc(void *p)
 
 void (*_cgo_malloc)(void*) = x_cgo_malloc;
 
-/* Stub for calling from Go */
+/* Stub for calling free from Go */
 static void
 x_cgo_free(void *p)
 {