summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Wedgwood <cw@f00f.org>2010-04-27 10:45:33 -0700
committerChristopher Wedgwood <cw@f00f.org>2010-04-27 10:45:33 -0700
commitb08da68d06f1adbf33982b481b2a215fa93f06b3 (patch)
tree4dae35461601491ec9d509d89af0c3190b4eb2f2
parent66b85e2767c292ee8b7e56415b2203c2f9d63ef5 (diff)
downloadgolang-b08da68d06f1adbf33982b481b2a215fa93f06b3.tar.gz
godoc: use int64 for timestamps
This fixes a crash seen when viewing a directory list. Fixes issue 747. R=gri CC=golang-dev, rsc http://codereview.appspot.com/1010042 Committer: Robert Griesemer <gri@golang.org>
-rw-r--r--src/cmd/godoc/godoc.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go
index daadef8c4..bf8912e1d 100644
--- a/src/cmd/godoc/godoc.go
+++ b/src/cmd/godoc/godoc.go
@@ -783,8 +783,7 @@ func paddingFmt(w io.Writer, x interface{}, format string) {
// Template formatter for "time" format.
func timeFmt(w io.Writer, x interface{}, format string) {
- // note: os.FileInfo.Mtime_ns is in uint64 in ns!
- template.HTMLEscape(w, []byte(time.SecondsToLocalTime(int64(x.(uint64)/1e9)).String()))
+ template.HTMLEscape(w, []byte(time.SecondsToLocalTime(x.(int64)/1e9).String()))
}
@@ -885,7 +884,7 @@ func servePage(c *http.Conn, title, subtitle, query string, content []byte) {
Title string
Subtitle string
PkgRoots []string
- Timestamp uint64 // int64 to be compatible with os.FileInfo.Mtime_ns
+ Timestamp int64
Query string
Version string
Menu []byte
@@ -897,7 +896,7 @@ func servePage(c *http.Conn, title, subtitle, query string, content []byte) {
Title: title,
Subtitle: subtitle,
PkgRoots: fsMap.PrefixList(),
- Timestamp: uint64(ts) * 1e9, // timestamp in ns
+ Timestamp: ts * 1e9, // timestamp in ns
Query: query,
Version: runtime.Version(),
Menu: nil,