qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-12 05:30:21 -07:00
Code Releases Activity

cmd/godoc: move note argument to godoc.go

Browse Source 
Fixes the App Engine version of godoc. The other fix is to duplicate
this code inside appinit.go. I think initHandlers is the right place
to put the strings.Split call, as the notesToShow var is used by
docServer, which is what initHandlers sets up.

R=dsymonds
CC=golang-dev
https://golang.org/cl/7434044
This commit is contained in:
Andrew Gerrand 2013-03-04 09:02:45 +11:00
parent bfbac2dc1c
commit 15825dc935
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/godoc/godoc.go
View File

@ -83,9 +83,16 @@ var (
fileServer http.Handler // default file server
cmdHandler docServer
pkgHandler docServer
// which code 'Notes' to show
notes = flag.String("notes", "BUG", "comma separated list of Note markers as per pkg:go/doc")
// list of 'Notes' to show
notesToShow []string
)
func initHandlers() {
notesToShow = strings.Split(*notes, ",")
fileServer = http.FileServer(&httpFS{fs})
cmdHandler = docServer{"/cmd/", "/src/cmd"}
pkgHandler = docServer{"/pkg/", "/src/pkg"}

7
src/cmd/godoc/main.go
View File

@ -71,11 +71,6 @@ var (
// command-line searches
query = flag.Bool("q", false, "arguments are considered search queries")
// which code 'Notes' to show.
notes = flag.String("notes", "BUG", "comma separated list of Note markers as per pkg:go/doc")
// vector of 'Notes' to show.
notesToShow []string
)
func serveError(w http.ResponseWriter, r *http.Request, relpath string, err error) {
@ -162,8 +157,6 @@ func main() {
flag.Usage = usage
flag.Parse()
notesToShow = strings.Split(*notes, ",")
// Check usage: either server and no args, command line and args, or index creation mode
if (*httpAddr != "" || *urlFlag != "") != (flag.NArg() == 0) && !*writeIndex {
usage()