dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bencode: Simplify parse_int

This commit is contained in:
Matt Joiner 2015-08-23 17:51:24 +10:00
parent ad73a0ea89
commit 0403d4185d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bencode/decode.go
View File

@ -98,34 +98,36 @@ func (d *decoder) parse_int(v reflect.Value) {
})
}
s := d.buf.String()
switch v.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
n, err := strconv.ParseInt(d.buf.String(), 10, 64)
n, err := strconv.ParseInt(s, 10, 64)
check_for_int_parse_error(err, start)
if v.OverflowInt(n) {
panic(&UnmarshalTypeError{
Value: "integer " + d.buf.String(),
Value: "integer " + s,
Type: v.Type(),
})
}
v.SetInt(n)
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
n, err := strconv.ParseUint(d.buf.String(), 10, 64)
n, err := strconv.ParseUint(s, 10, 64)
check_for_int_parse_error(err, start)
if v.OverflowUint(n) {
panic(&UnmarshalTypeError{
Value: "integer " + d.buf.String(),
Value: "integer " + s,
Type: v.Type(),
})
}
v.SetUint(n)
case reflect.Bool:
v.SetBool(d.buf.String() != "0")
v.SetBool(s != "0")
default:
panic(&UnmarshalTypeError{
Value: "integer " + d.buf.String(),
Value: "integer " + s,
Type: v.Type(),
})
}