Merge commit '464e8f86d9e8ec9d188e4b7c53ef26015147ec83'; remote branch 'nictuku/master'

Conflicts:
	torrent.go
This commit is contained in:
Jack Palevich 2010-07-12 20:44:44 -07:00
commit 6ca7f8f160

View file

@ -334,7 +334,7 @@ func (a StringValueArray) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
func writeSVList(w io.Writer, svList StringValueArray) (err os.Error) { func writeSVList(w io.Writer, svList StringValueArray) (err os.Error) {
sort.Sort(svList) sort.Sort(svList)
for _, sv := range (svList) { for _, sv := range svList {
if isValueNil(sv.value) { if isValueNil(sv.value) {
continue // Skip null values continue // Skip null values
} }
@ -367,7 +367,7 @@ func writeMap(w io.Writer, val *reflect.MapValue) (err os.Error) {
// Sort keys // Sort keys
svList := make(StringValueArray, len(keys)) svList := make(StringValueArray, len(keys))
for i, key := range (keys) { for i, key := range keys {
svList[i].key = key.(*reflect.StringValue).Get() svList[i].key = key.(*reflect.StringValue).Get()
svList[i].value = val.Elem(key) svList[i].value = val.Elem(key)
} }