Skip to content

G
go
Commit 4c91b137 authored by Rob Pike's avatar Rob Pike
Browse files
Options

encoding/gob: fix print format in generated decoder helpers 

Needed a %% to quote a percent in the format.

LGTM=adg
R=golang-codereviews, adg
CC=golang-codereviews
https://golang.org/cl/156330043
parent e330cc16
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
src/encoding/gob/dec_helpers.go
View file @ 4c91b137
...@@ -65,7 +65,7 @@ func decBoolSlice(state *decoderState, v reflect.Value, length int, ovfl error) ...@@ -65,7 +65,7 @@ func decBoolSlice(state *decoderState, v reflect.Value, length int, ovfl error)
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding bool array or slice: length exceeds input size (%!d(string=Bool) elements)", length) errorf("decoding bool array or slice: length exceeds input size (%d elements)", length)
} }
slice[i] = state.decodeUint() != 0 slice[i] = state.decodeUint() != 0
} }
...@@ -88,7 +88,7 @@ func decComplex64Slice(state *decoderState, v reflect.Value, length int, ovfl er ...@@ -88,7 +88,7 @@ func decComplex64Slice(state *decoderState, v reflect.Value, length int, ovfl er
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding complex64 array or slice: length exceeds input size (%!d(string=Complex64) elements)", length) errorf("decoding complex64 array or slice: length exceeds input size (%d elements)", length)
} }
real := float32FromBits(state.decodeUint(), ovfl) real := float32FromBits(state.decodeUint(), ovfl)
imag := float32FromBits(state.decodeUint(), ovfl) imag := float32FromBits(state.decodeUint(), ovfl)
...@@ -113,7 +113,7 @@ func decComplex128Slice(state *decoderState, v reflect.Value, length int, ovfl e ...@@ -113,7 +113,7 @@ func decComplex128Slice(state *decoderState, v reflect.Value, length int, ovfl e
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding complex128 array or slice: length exceeds input size (%!d(string=Complex128) elements)", length) errorf("decoding complex128 array or slice: length exceeds input size (%d elements)", length)
} }
real := float64FromBits(state.decodeUint()) real := float64FromBits(state.decodeUint())
imag := float64FromBits(state.decodeUint()) imag := float64FromBits(state.decodeUint())
...@@ -138,7 +138,7 @@ func decFloat32Slice(state *decoderState, v reflect.Value, length int, ovfl erro ...@@ -138,7 +138,7 @@ func decFloat32Slice(state *decoderState, v reflect.Value, length int, ovfl erro
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding float32 array or slice: length exceeds input size (%!d(string=Float32) elements)", length) errorf("decoding float32 array or slice: length exceeds input size (%d elements)", length)
} }
slice[i] = float32(float32FromBits(state.decodeUint(), ovfl)) slice[i] = float32(float32FromBits(state.decodeUint(), ovfl))
} }
...@@ -161,7 +161,7 @@ func decFloat64Slice(state *decoderState, v reflect.Value, length int, ovfl erro ...@@ -161,7 +161,7 @@ func decFloat64Slice(state *decoderState, v reflect.Value, length int, ovfl erro
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding float64 array or slice: length exceeds input size (%!d(string=Float64) elements)", length) errorf("decoding float64 array or slice: length exceeds input size (%d elements)", length)
} }
slice[i] = float64FromBits(state.decodeUint()) slice[i] = float64FromBits(state.decodeUint())
} }
...@@ -184,7 +184,7 @@ func decIntSlice(state *decoderState, v reflect.Value, length int, ovfl error) b ...@@ -184,7 +184,7 @@ func decIntSlice(state *decoderState, v reflect.Value, length int, ovfl error) b
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding int array or slice: length exceeds input size (%!d(string=Int) elements)", length) errorf("decoding int array or slice: length exceeds input size (%d elements)", length)
} }
x := state.decodeInt() x := state.decodeInt()
// MinInt and MaxInt // MinInt and MaxInt
...@@ -212,7 +212,7 @@ func decInt16Slice(state *decoderState, v reflect.Value, length int, ovfl error) ...@@ -212,7 +212,7 @@ func decInt16Slice(state *decoderState, v reflect.Value, length int, ovfl error)
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding int16 array or slice: length exceeds input size (%!d(string=Int16) elements)", length) errorf("decoding int16 array or slice: length exceeds input size (%d elements)", length)
} }
x := state.decodeInt() x := state.decodeInt()
if x < math.MinInt16 || math.MaxInt16 < x { if x < math.MinInt16 || math.MaxInt16 < x {
...@@ -239,7 +239,7 @@ func decInt32Slice(state *decoderState, v reflect.Value, length int, ovfl error) ...@@ -239,7 +239,7 @@ func decInt32Slice(state *decoderState, v reflect.Value, length int, ovfl error)
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding int32 array or slice: length exceeds input size (%!d(string=Int32) elements)", length) errorf("decoding int32 array or slice: length exceeds input size (%d elements)", length)
} }
x := state.decodeInt() x := state.decodeInt()
if x < math.MinInt32 || math.MaxInt32 < x { if x < math.MinInt32 || math.MaxInt32 < x {
...@@ -266,7 +266,7 @@ func decInt64Slice(state *decoderState, v reflect.Value, length int, ovfl error) ...@@ -266,7 +266,7 @@ func decInt64Slice(state *decoderState, v reflect.Value, length int, ovfl error)
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding int64 array or slice: length exceeds input size (%!d(string=Int64) elements)", length) errorf("decoding int64 array or slice: length exceeds input size (%d elements)", length)
} }
slice[i] = state.decodeInt() slice[i] = state.decodeInt()
} }
...@@ -289,7 +289,7 @@ func decInt8Slice(state *decoderState, v reflect.Value, length int, ovfl error) ...@@ -289,7 +289,7 @@ func decInt8Slice(state *decoderState, v reflect.Value, length int, ovfl error)
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding int8 array or slice: length exceeds input size (%!d(string=Int8) elements)", length) errorf("decoding int8 array or slice: length exceeds input size (%d elements)", length)
} }
x := state.decodeInt() x := state.decodeInt()
if x < math.MinInt8 || math.MaxInt8 < x { if x < math.MinInt8 || math.MaxInt8 < x {
...@@ -316,7 +316,7 @@ func decStringSlice(state *decoderState, v reflect.Value, length int, ovfl error ...@@ -316,7 +316,7 @@ func decStringSlice(state *decoderState, v reflect.Value, length int, ovfl error
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding string array or slice: length exceeds input size (%!d(string=String) elements)", length) errorf("decoding string array or slice: length exceeds input size (%d elements)", length)
} }
u := state.decodeUint() u := state.decodeUint()
n := int(u) n := int(u)
...@@ -352,7 +352,7 @@ func decUintSlice(state *decoderState, v reflect.Value, length int, ovfl error) ...@@ -352,7 +352,7 @@ func decUintSlice(state *decoderState, v reflect.Value, length int, ovfl error)
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding uint array or slice: length exceeds input size (%!d(string=Uint) elements)", length) errorf("decoding uint array or slice: length exceeds input size (%d elements)", length)
} }
x := state.decodeUint() x := state.decodeUint()
/*TODO if math.MaxUint32 < x { /*TODO if math.MaxUint32 < x {
...@@ -379,7 +379,7 @@ func decUint16Slice(state *decoderState, v reflect.Value, length int, ovfl error ...@@ -379,7 +379,7 @@ func decUint16Slice(state *decoderState, v reflect.Value, length int, ovfl error
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding uint16 array or slice: length exceeds input size (%!d(string=Uint16) elements)", length) errorf("decoding uint16 array or slice: length exceeds input size (%d elements)", length)
} }
x := state.decodeUint() x := state.decodeUint()
if math.MaxUint16 < x { if math.MaxUint16 < x {
...@@ -406,7 +406,7 @@ func decUint32Slice(state *decoderState, v reflect.Value, length int, ovfl error ...@@ -406,7 +406,7 @@ func decUint32Slice(state *decoderState, v reflect.Value, length int, ovfl error
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding uint32 array or slice: length exceeds input size (%!d(string=Uint32) elements)", length) errorf("decoding uint32 array or slice: length exceeds input size (%d elements)", length)
} }
x := state.decodeUint() x := state.decodeUint()
if math.MaxUint32 < x { if math.MaxUint32 < x {
...@@ -433,7 +433,7 @@ func decUint64Slice(state *decoderState, v reflect.Value, length int, ovfl error ...@@ -433,7 +433,7 @@ func decUint64Slice(state *decoderState, v reflect.Value, length int, ovfl error
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding uint64 array or slice: length exceeds input size (%!d(string=Uint64) elements)", length) errorf("decoding uint64 array or slice: length exceeds input size (%d elements)", length)
} }
slice[i] = state.decodeUint() slice[i] = state.decodeUint()
} }
...@@ -456,7 +456,7 @@ func decUintptrSlice(state *decoderState, v reflect.Value, length int, ovfl erro ...@@ -456,7 +456,7 @@ func decUintptrSlice(state *decoderState, v reflect.Value, length int, ovfl erro
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding uintptr array or slice: length exceeds input size (%!d(string=Uintptr) elements)", length) errorf("decoding uintptr array or slice: length exceeds input size (%d elements)", length)
} }
x := state.decodeUint() x := state.decodeUint()
if uint64(^uintptr(0)) < x { if uint64(^uintptr(0)) < x {
......
src/encoding/gob/decgen.go
View file @ 4c91b137
...@@ -231,7 +231,7 @@ func dec%[2]sSlice(state *decoderState, v reflect.Value, length int, ovfl error) ...@@ -231,7 +231,7 @@ func dec%[2]sSlice(state *decoderState, v reflect.Value, length int, ovfl error)
} }
for i := 0; i < length; i++ { for i := 0; i < length; i++ {
if state.b.Len() == 0 { if state.b.Len() == 0 {
errorf("decoding %[1]s array or slice: length exceeds input size (%d elements)", length) errorf("decoding %[1]s array or slice: length exceeds input size (%%d elements)", length)
} }
%[3]s %[3]s
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7