From: Matthew Dempsky <mdempsky@google.com>
Date: Thu, 8 Jan 2015 00:30:24 +0000 (-0800)
Subject: cmd/cgo, go/build: finish a cleanup TODO
X-Git-Tag: go1.5beta1~2409
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ee94cd1dfff26e3044713367adcdf901a5e2653a;p=gostls13.git

cmd/cgo, go/build: finish a cleanup TODO

Removing #cgo directive parsing from cmd/cgo was done in
https://golang.org/cl/8610044.

Change-Id: Id1bec58c6ec1f932df0ce0ee84ff253655bb73ff
Reviewed-on: https://go-review.googlesource.com/2501
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/cmd/cgo/gcc.go b/src/cmd/cgo/gcc.go
index 2316ff0e20..864fda0258 100644
--- a/src/cmd/cgo/gcc.go
+++ b/src/cmd/cgo/gcc.go
@@ -154,20 +154,6 @@ func splitQuoted(s string) (r []string, err error) {
 	return args, err
 }
 
-var safeBytes = []byte(`+-.,/0123456789:=ABCDEFGHIJKLMNOPQRSTUVWXYZ\_abcdefghijklmnopqrstuvwxyz`)
-
-func safeName(s string) bool {
-	if s == "" {
-		return false
-	}
-	for i := 0; i < len(s); i++ {
-		if c := s[i]; c < 0x80 && bytes.IndexByte(safeBytes, c) < 0 {
-			return false
-		}
-	}
-	return true
-}
-
 // Translate rewrites f.AST, the original Go input, to remove
 // references to the imported package C, replacing them with
 // references to the equivalent Go types, functions, and variables.
diff --git a/src/go/build/build.go b/src/go/build/build.go
index 62935ee0cf..6e95e486fe 100644
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@ -1073,9 +1073,6 @@ func (ctxt *Context) shouldBuild(content []byte, allTags map[string]bool) bool {
 // saveCgo saves the information from the #cgo lines in the import "C" comment.
 // These lines set CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS and pkg-config directives
 // that affect the way cgo's C code is built.
-//
-// TODO(rsc): This duplicates code in cgo.
-// Once the dust settles, remove this code from cgo.
 func (ctxt *Context) saveCgo(filename string, di *Package, cg *ast.CommentGroup) error {
 	text := cg.Text()
 	for _, line := range strings.Split(text, "\n") {