From d6825c9af879954e094d7ae20d22d2a43af762d0 Mon Sep 17 00:00:00 2001 From: Amit Levy Date: Fri, 8 Jul 2011 17:34:23 -0400 Subject: [PATCH] Changed all references of sort.SortStrings to sort.Strings per commit 9012 of go Change-Id: I2af1eeea05b65db10b17bc077a8af2dd5778910d --- clients/go/cammount/main.go | 2 +- clients/go/camput/camput.go | 2 +- lib/go/camli/blobserver/localdisk/enumerate.go | 2 +- lib/go/camli/misc/amazon/s3/auth.go | 2 +- lib/go/camli/third_party/github.com/hanwen/go-fuse/fuse/misc.go | 2 +- .../third_party/github.com/hanwen/go-fuse/fuse/timingfs.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clients/go/cammount/main.go b/clients/go/cammount/main.go index 07591a785..fd03c71cc 100644 --- a/clients/go/cammount/main.go +++ b/clients/go/cammount/main.go @@ -35,7 +35,7 @@ func PrintMap(m map[string]float64) { keys = append(keys, k) } - sort.SortStrings(keys) + sort.Strings(keys) for _, k := range keys { if m[k] > 0 { fmt.Println(k, m[k]) diff --git a/clients/go/camput/camput.go b/clients/go/camput/camput.go index a22cf07bc..9066092f6 100644 --- a/clients/go/camput/camput.go +++ b/clients/go/camput/camput.go @@ -122,7 +122,7 @@ func (up *Uploader) UploadFile(filename string) (*client.PutResult, os.Error) { return nil, err } dir.Close() - sort.SortStrings(dirNames) + sort.Strings(dirNames) // TODO: process dirName entries in parallel for _, dirEntName := range dirNames { pr, err := up.UploadFile(filename + "/" + dirEntName) diff --git a/lib/go/camli/blobserver/localdisk/enumerate.go b/lib/go/camli/blobserver/localdisk/enumerate.go index 6b5e68e83..6ae38e315 100644 --- a/lib/go/camli/blobserver/localdisk/enumerate.go +++ b/lib/go/camli/blobserver/localdisk/enumerate.go @@ -59,7 +59,7 @@ func readBlobs(opts readBlobRequest) os.Error { if err != nil { return &enumerateError{"localdisk: readdirnames of " + dirFullPath, err} } - sort.SortStrings(names) + sort.Strings(names) for _, name := range names { if *opts.remain == 0 { return nil diff --git a/lib/go/camli/misc/amazon/s3/auth.go b/lib/go/camli/misc/amazon/s3/auth.go index ebcd20ad3..8678709fd 100644 --- a/lib/go/camli/misc/amazon/s3/auth.go +++ b/lib/go/camli/misc/amazon/s3/auth.go @@ -110,7 +110,7 @@ func writeCanonicalizedAmzHeaders(buf *bytes.Buffer, req *http.Request) { vals[lk] = vv } } - sort.SortStrings(amzHeaders) + sort.Strings(amzHeaders) for _, k := range amzHeaders { buf.WriteString(k) buf.WriteByte(':') diff --git a/lib/go/camli/third_party/github.com/hanwen/go-fuse/fuse/misc.go b/lib/go/camli/third_party/github.com/hanwen/go-fuse/fuse/misc.go index c424c0ef1..a4d190a07 100644 --- a/lib/go/camli/third_party/github.com/hanwen/go-fuse/fuse/misc.go +++ b/lib/go/camli/third_party/github.com/hanwen/go-fuse/fuse/misc.go @@ -315,7 +315,7 @@ func PrintMap(m map[string]float64) { keys = append(keys, k) } - sort.SortStrings(keys) + sort.Strings(keys) for _, k := range keys { if m[k] > 0 { fmt.Println(k, m[k]) diff --git a/lib/go/camli/third_party/github.com/hanwen/go-fuse/fuse/timingfs.go b/lib/go/camli/third_party/github.com/hanwen/go-fuse/fuse/timingfs.go index 5df2176e3..a9ddf3609 100644 --- a/lib/go/camli/third_party/github.com/hanwen/go-fuse/fuse/timingfs.go +++ b/lib/go/camli/third_party/github.com/hanwen/go-fuse/fuse/timingfs.go @@ -82,7 +82,7 @@ func (me *TimingPathFilesystem) HotPaths(operation string) (paths []string, uniq results = append(results, fmt.Sprintf("% 9d %s", v, k)) } - sort.SortStrings(results) + sort.Strings(results) return results, len(counts) }