diff options
| author | Russ Cox <rsc@golang.org> | 2009-04-15 20:27:45 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-04-15 20:27:45 -0700 |
| commit | 60ce95d7a1677d98ca098a3657e00d71b6021a30 (patch) | |
| tree | 16cfcc3cc7d82aa01da1b152e520297da5afc88a /src/lib/http | |
| parent | 65d397f747f565cbea57dd40f4f838bbab803243 (diff) | |
| download | go-60ce95d7a1677d98ca098a3657e00d71b6021a30.tar.xz | |
code changes for array conversion.
as a reminder, the old conversion
was that you could write
var arr [10]byte;
var slice []byte;
slice = arr;
but now you have to write
slice = &arr;
the change eliminates an implicit &, so that
the only implicit &s left are in the . operator
and in string(arr).
also, removed utf8.EncodeRuneToString
in favor of string(rune).
R=r
DELTA=83 (1 added, 23 deleted, 59 changed)
OCL=27531
CL=27534
Diffstat (limited to 'src/lib/http')
| -rw-r--r-- | src/lib/http/fs.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/http/fs.go b/src/lib/http/fs.go index d93859dd25..23a994aa0d 100644 --- a/src/lib/http/fs.go +++ b/src/lib/http/fs.go @@ -142,7 +142,7 @@ func serveFileInternal(c *Conn, r *Request, name string, redirect bool) { } else { // read first chunk to decide between utf-8 text and binary var buf [1024]byte; - n, err := io.Readn(f, buf); + n, err := io.Readn(f, &buf); b := buf[0:n]; if isText(b) { c.SetHeader("Content-Type", "text-plain; charset=utf-8"); |
