Merge pull request #141 from moul/dev/moul/fix-int64-extension

fix: fix 'int64*Extension' helpers
This commit is contained in:
Manfred Touron 2019-02-10 21:41:51 +01:00 committed by GitHub
commit 3576fd314a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -389,7 +389,7 @@ func int64FieldExtension(fieldID int32, f *descriptor.FieldDescriptorProto) int6
return 0 return 0
} }
var extendedType *descriptor.FieldOptions var extendedType *descriptor.FieldOptions
var extensionType *string var extensionType *int64
eds := proto.RegisteredExtensions(f.Options) eds := proto.RegisteredExtensions(f.Options)
if eds[fieldID] == nil { if eds[fieldID] == nil {
@ -397,7 +397,7 @@ func int64FieldExtension(fieldID int32, f *descriptor.FieldDescriptorProto) int6
ExtendedType: extendedType, ExtendedType: extendedType,
ExtensionType: extensionType, ExtensionType: extensionType,
Field: fieldID, Field: fieldID,
Tag: fmt.Sprintf("bytes,%d", fieldID), Tag: fmt.Sprintf("varint,%d", fieldID),
} }
proto.RegisterExtension(ed) proto.RegisterExtension(ed)
eds = proto.RegisteredExtensions(f.Options) eds = proto.RegisteredExtensions(f.Options)
@ -424,7 +424,7 @@ func int64MessageExtension(fieldID int32, f *descriptor.DescriptorProto) int64 {
return 0 return 0
} }
var extendedType *descriptor.MessageOptions var extendedType *descriptor.MessageOptions
var extensionType *string var extensionType *int64
eds := proto.RegisteredExtensions(f.Options) eds := proto.RegisteredExtensions(f.Options)
if eds[fieldID] == nil { if eds[fieldID] == nil {
@ -432,7 +432,7 @@ func int64MessageExtension(fieldID int32, f *descriptor.DescriptorProto) int64 {
ExtendedType: extendedType, ExtendedType: extendedType,
ExtensionType: extensionType, ExtensionType: extensionType,
Field: fieldID, Field: fieldID,
Tag: fmt.Sprintf("bytes,%d", fieldID), Tag: fmt.Sprintf("varint,%d", fieldID),
} }
proto.RegisterExtension(ed) proto.RegisterExtension(ed)
eds = proto.RegisteredExtensions(f.Options) eds = proto.RegisteredExtensions(f.Options)