mirror of
https://github.com/golang/go
synced 2024-11-20 06:34:40 -07:00
gob: trivial cleanup
R=golang-dev, r CC=golang-dev https://golang.org/cl/4279074
This commit is contained in:
parent
2795b13156
commit
a4df525a79
@ -407,7 +407,7 @@ func (s *structType) string() string { return s.safeString(make(map[typeId]bool)
|
|||||||
func newStructType(name string) *structType {
|
func newStructType(name string) *structType {
|
||||||
s := &structType{CommonType{Name: name}, nil}
|
s := &structType{CommonType{Name: name}, nil}
|
||||||
// For historical reasons we set the id here rather than init.
|
// For historical reasons we set the id here rather than init.
|
||||||
// Se the comment in newTypeObject for details.
|
// See the comment in newTypeObject for details.
|
||||||
setTypeId(s)
|
setTypeId(s)
|
||||||
return s
|
return s
|
||||||
}
|
}
|
||||||
@ -545,7 +545,7 @@ func getBaseType(name string, rt reflect.Type) (gobType, os.Error) {
|
|||||||
// getType returns the Gob type describing the given reflect.Type.
|
// getType returns the Gob type describing the given reflect.Type.
|
||||||
// Should be called only when handling GobEncoders/Decoders,
|
// Should be called only when handling GobEncoders/Decoders,
|
||||||
// which may be pointers. All other types are handled through the
|
// which may be pointers. All other types are handled through the
|
||||||
// base type, never a pointer.
|
// base type, never a pointer.
|
||||||
// typeLock must be held.
|
// typeLock must be held.
|
||||||
func getType(name string, ut *userTypeInfo, rt reflect.Type) (gobType, os.Error) {
|
func getType(name string, ut *userTypeInfo, rt reflect.Type) (gobType, os.Error) {
|
||||||
typ, present := types[rt]
|
typ, present := types[rt]
|
||||||
@ -561,7 +561,7 @@ func getType(name string, ut *userTypeInfo, rt reflect.Type) (gobType, os.Error)
|
|||||||
|
|
||||||
func checkId(want, got typeId) {
|
func checkId(want, got typeId) {
|
||||||
if want != got {
|
if want != got {
|
||||||
fmt.Fprintf(os.Stderr, "checkId: %d should be %d\n", int(want), int(got))
|
fmt.Fprintf(os.Stderr, "checkId: %d should be %d\n", int(got), int(want))
|
||||||
panic("bootstrap type wrong id: " + got.name() + " " + got.string() + " not " + want.string())
|
panic("bootstrap type wrong id: " + got.name() + " " + got.string() + " not " + want.string())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user