Commit 23c06445 authored by Christopher Wedgwood's avatar Christopher Wedgwood Committed by Robert Griesemer

godoc: use int64 for timestamps

This fixes a crash seen when viewing a directory list.

Fixes #747.

R=gri
CC=golang-dev, rsc
https://golang.org/cl/1010042
parent bec40ba5
...@@ -783,8 +783,7 @@ func paddingFmt(w io.Writer, x interface{}, format string) { ...@@ -783,8 +783,7 @@ func paddingFmt(w io.Writer, x interface{}, format string) {
// Template formatter for "time" format. // Template formatter for "time" format.
func timeFmt(w io.Writer, x interface{}, format string) { 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(x.(int64)/1e9).String()))
template.HTMLEscape(w, []byte(time.SecondsToLocalTime(int64(x.(uint64)/1e9)).String()))
} }
...@@ -885,7 +884,7 @@ func servePage(c *http.Conn, title, subtitle, query string, content []byte) { ...@@ -885,7 +884,7 @@ func servePage(c *http.Conn, title, subtitle, query string, content []byte) {
Title string Title string
Subtitle string Subtitle string
PkgRoots []string PkgRoots []string
Timestamp uint64 // int64 to be compatible with os.FileInfo.Mtime_ns Timestamp int64
Query string Query string
Version string Version string
Menu []byte Menu []byte
...@@ -897,7 +896,7 @@ func servePage(c *http.Conn, title, subtitle, query string, content []byte) { ...@@ -897,7 +896,7 @@ func servePage(c *http.Conn, title, subtitle, query string, content []byte) {
Title: title, Title: title,
Subtitle: subtitle, Subtitle: subtitle,
PkgRoots: fsMap.PrefixList(), PkgRoots: fsMap.PrefixList(),
Timestamp: uint64(ts) * 1e9, // timestamp in ns Timestamp: ts * 1e9, // timestamp in ns
Query: query, Query: query,
Version: runtime.Version(), Version: runtime.Version(),
Menu: nil, Menu: nil,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment