|
Jan Chaloupka |
ebf376 |
From 62d30d1b956bbc7f4249e3b42c6f8b3e5db26789 Mon Sep 17 00:00:00 2001
|
|
Jan Chaloupka |
ebf376 |
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
Jan Chaloupka |
ebf376 |
Date: Fri, 20 Feb 2015 11:04:20 +0100
|
|
Jan Chaloupka |
ebf376 |
Subject: [PATCH] Replace depricated ErrWrongType with its local definition
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
---
|
|
Jan Chaloupka |
ebf376 |
etcdserver/etcdserverpb/etcdserver.pb.go | 39 ++++++++++---------
|
|
Jan Chaloupka |
ebf376 |
migrate/etcd4pb/log_entry.pb.go | 10 +++--
|
|
Jan Chaloupka |
ebf376 |
raft/raftpb/raft.pb.go | 64 ++++++++++++++++++--------------
|
|
Jan Chaloupka |
ebf376 |
snap/snappb/snap.pb.go | 6 ++-
|
|
Jan Chaloupka |
ebf376 |
wal/walpb/record.pb.go | 13 ++++---
|
|
Jan Chaloupka |
ebf376 |
5 files changed, 75 insertions(+), 57 deletions(-)
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
diff --git a/etcdserver/etcdserverpb/etcdserver.pb.go b/etcdserver/etcdserverpb/etcdserver.pb.go
|
|
Jan Chaloupka |
ebf376 |
index 2e8afc0..42eb0c2 100644
|
|
Jan Chaloupka |
ebf376 |
--- a/etcdserver/etcdserverpb/etcdserver.pb.go
|
|
Jan Chaloupka |
ebf376 |
+++ b/etcdserver/etcdserverpb/etcdserver.pb.go
|
|
Jan Chaloupka |
ebf376 |
@@ -22,6 +22,7 @@ import math "math"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
import io "io"
|
|
Jan Chaloupka |
ebf376 |
import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
|
|
Jan Chaloupka |
ebf376 |
+import errors "errors"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
// Reference proto, json, and math imports to suppress error if they are not otherwise used.
|
|
Jan Chaloupka |
ebf376 |
var _ = proto.Marshal
|
|
Jan Chaloupka |
ebf376 |
@@ -67,6 +68,7 @@ func init() {
|
|
Jan Chaloupka |
ebf376 |
func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -85,7 +87,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -100,7 +102,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var stringLen uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -122,7 +124,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
index = postIndex
|
|
Jan Chaloupka |
ebf376 |
case 3:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var stringLen uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -144,7 +146,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
index = postIndex
|
|
Jan Chaloupka |
ebf376 |
case 4:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var stringLen uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -166,7 +168,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
index = postIndex
|
|
Jan Chaloupka |
ebf376 |
case 5:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -183,7 +185,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
m.Dir = bool(v != 0)
|
|
Jan Chaloupka |
ebf376 |
case 6:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var stringLen uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -205,7 +207,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
index = postIndex
|
|
Jan Chaloupka |
ebf376 |
case 7:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -220,7 +222,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 8:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -238,7 +240,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
m.PrevExist = &b
|
|
Jan Chaloupka |
ebf376 |
case 9:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -253,7 +255,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 10:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -270,7 +272,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
m.Wait = bool(v != 0)
|
|
Jan Chaloupka |
ebf376 |
case 11:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -285,7 +287,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 12:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -302,7 +304,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
m.Recursive = bool(v != 0)
|
|
Jan Chaloupka |
ebf376 |
case 13:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -319,7 +321,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
m.Sorted = bool(v != 0)
|
|
Jan Chaloupka |
ebf376 |
case 14:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -336,7 +338,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
m.Quorum = bool(v != 0)
|
|
Jan Chaloupka |
ebf376 |
case 15:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -351,7 +353,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 16:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -392,6 +394,7 @@ func (m *Request) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
func (m *Metadata) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -410,7 +413,7 @@ func (m *Metadata) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -425,7 +428,7 @@ func (m *Metadata) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
diff --git a/migrate/etcd4pb/log_entry.pb.go b/migrate/etcd4pb/log_entry.pb.go
|
|
Jan Chaloupka |
ebf376 |
index c969241..0ccc80d 100644
|
|
Jan Chaloupka |
ebf376 |
--- a/migrate/etcd4pb/log_entry.pb.go
|
|
Jan Chaloupka |
ebf376 |
+++ b/migrate/etcd4pb/log_entry.pb.go
|
|
Jan Chaloupka |
ebf376 |
@@ -12,6 +12,7 @@ import math "math"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
import io "io"
|
|
Jan Chaloupka |
ebf376 |
import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
|
|
Jan Chaloupka |
ebf376 |
+import errors "errors"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
import fmt "fmt"
|
|
Jan Chaloupka |
ebf376 |
import strings "strings"
|
|
Jan Chaloupka |
ebf376 |
@@ -76,6 +77,7 @@ func init() {
|
|
Jan Chaloupka |
ebf376 |
func (m *LogEntry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -94,7 +96,7 @@ func (m *LogEntry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -111,7 +113,7 @@ func (m *LogEntry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
m.Index = &v
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -128,7 +130,7 @@ func (m *LogEntry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
m.Term = &v
|
|
Jan Chaloupka |
ebf376 |
case 3:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var stringLen uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -151,7 +153,7 @@ func (m *LogEntry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
index = postIndex
|
|
Jan Chaloupka |
ebf376 |
case 4:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var byteLen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
diff --git a/raft/raftpb/raft.pb.go b/raft/raftpb/raft.pb.go
|
|
Jan Chaloupka |
ebf376 |
index 88a08fd..ec40c14 100644
|
|
Jan Chaloupka |
ebf376 |
--- a/raft/raftpb/raft.pb.go
|
|
Jan Chaloupka |
ebf376 |
+++ b/raft/raftpb/raft.pb.go
|
|
Jan Chaloupka |
ebf376 |
@@ -27,6 +27,7 @@ import math "math"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
import io "io"
|
|
Jan Chaloupka |
ebf376 |
import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
|
|
Jan Chaloupka |
ebf376 |
+import errors "errors"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
// Reference proto, json, and math imports to suppress error if they are not otherwise used.
|
|
Jan Chaloupka |
ebf376 |
var _ = proto.Marshal
|
|
Jan Chaloupka |
ebf376 |
@@ -251,6 +252,7 @@ func init() {
|
|
Jan Chaloupka |
ebf376 |
func (m *Entry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -269,7 +271,7 @@ func (m *Entry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -284,7 +286,7 @@ func (m *Entry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -299,7 +301,7 @@ func (m *Entry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 3:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -314,7 +316,7 @@ func (m *Entry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 4:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var byteLen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -360,6 +362,7 @@ func (m *Entry) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
func (m *SnapshotMetadata) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -378,7 +381,7 @@ func (m *SnapshotMetadata) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var msglen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -402,7 +405,7 @@ func (m *SnapshotMetadata) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
index = postIndex
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -417,7 +420,7 @@ func (m *SnapshotMetadata) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 3:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -456,6 +459,7 @@ func (m *SnapshotMetadata) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -474,7 +478,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var byteLen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -496,7 +500,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
index = postIndex
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var msglen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -544,6 +548,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -562,7 +567,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -577,7 +582,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -592,7 +597,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 3:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -607,7 +612,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 4:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -622,7 +627,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 5:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -637,7 +642,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 6:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -652,7 +657,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 7:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var msglen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -675,7 +680,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
index = postIndex
|
|
Jan Chaloupka |
ebf376 |
case 8:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -690,7 +695,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 9:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var msglen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -714,7 +719,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
index = postIndex
|
|
Jan Chaloupka |
ebf376 |
case 10:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -731,7 +736,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
m.Reject = bool(v != 0)
|
|
Jan Chaloupka |
ebf376 |
case 11:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -770,6 +775,7 @@ func (m *Message) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
func (m *HardState) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -788,7 +794,7 @@ func (m *HardState) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -803,7 +809,7 @@ func (m *HardState) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -818,7 +824,7 @@ func (m *HardState) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 3:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -857,6 +863,7 @@ func (m *HardState) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
func (m *ConfState) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -875,7 +882,7 @@ func (m *ConfState) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var v uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -916,6 +923,7 @@ func (m *ConfState) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
func (m *ConfChange) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -934,7 +942,7 @@ func (m *ConfChange) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -949,7 +957,7 @@ func (m *ConfChange) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -964,7 +972,7 @@ func (m *ConfChange) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 3:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -979,7 +987,7 @@ func (m *ConfChange) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 4:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var byteLen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
diff --git a/snap/snappb/snap.pb.go b/snap/snappb/snap.pb.go
|
|
Jan Chaloupka |
ebf376 |
index 1bc8927..8a5b7d2 100644
|
|
Jan Chaloupka |
ebf376 |
--- a/snap/snappb/snap.pb.go
|
|
Jan Chaloupka |
ebf376 |
+++ b/snap/snappb/snap.pb.go
|
|
Jan Chaloupka |
ebf376 |
@@ -21,6 +21,7 @@ import math "math"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
import io "io"
|
|
Jan Chaloupka |
ebf376 |
import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
|
|
Jan Chaloupka |
ebf376 |
+import errors "errors"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
// Reference proto, json, and math imports to suppress error if they are not otherwise used.
|
|
Jan Chaloupka |
ebf376 |
var _ = proto.Marshal
|
|
Jan Chaloupka |
ebf376 |
@@ -42,6 +43,7 @@ func init() {
|
|
Jan Chaloupka |
ebf376 |
func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -60,7 +62,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -75,7 +77,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var byteLen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
diff --git a/wal/walpb/record.pb.go b/wal/walpb/record.pb.go
|
|
Jan Chaloupka |
ebf376 |
index e556f51..2877b6e 100644
|
|
Jan Chaloupka |
ebf376 |
--- a/wal/walpb/record.pb.go
|
|
Jan Chaloupka |
ebf376 |
+++ b/wal/walpb/record.pb.go
|
|
Jan Chaloupka |
ebf376 |
@@ -22,6 +22,7 @@ import math "math"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
import io "io"
|
|
Jan Chaloupka |
ebf376 |
import code_google_com_p_gogoprotobuf_proto "code.google.com/p/gogoprotobuf/proto"
|
|
Jan Chaloupka |
ebf376 |
+import errors "errors"
|
|
Jan Chaloupka |
ebf376 |
|
|
Jan Chaloupka |
ebf376 |
// Reference proto, json, and math imports to suppress error if they are not otherwise used.
|
|
Jan Chaloupka |
ebf376 |
var _ = proto.Marshal
|
|
Jan Chaloupka |
ebf376 |
@@ -54,6 +55,7 @@ func init() {
|
|
Jan Chaloupka |
ebf376 |
func (m *Record) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -72,7 +74,7 @@ func (m *Record) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -87,7 +89,7 @@ func (m *Record) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -102,7 +104,7 @@ func (m *Record) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 3:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 2 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
var byteLen int
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -148,6 +150,7 @@ func (m *Record) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
l := len(data)
|
|
Jan Chaloupka |
ebf376 |
index := 0
|
|
Jan Chaloupka |
ebf376 |
+ var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
|
|
Jan Chaloupka |
ebf376 |
for index < l {
|
|
Jan Chaloupka |
ebf376 |
var wire uint64
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
@@ -166,7 +169,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
switch fieldNum {
|
|
Jan Chaloupka |
ebf376 |
case 1:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
@@ -181,7 +184,7 @@ func (m *Snapshot) Unmarshal(data []byte) error {
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
case 2:
|
|
Jan Chaloupka |
ebf376 |
if wireType != 0 {
|
|
Jan Chaloupka |
ebf376 |
- return code_google_com_p_gogoprotobuf_proto.ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
+ return ErrWrongType
|
|
Jan Chaloupka |
ebf376 |
}
|
|
Jan Chaloupka |
ebf376 |
for shift := uint(0); ; shift += 7 {
|
|
Jan Chaloupka |
ebf376 |
if index >= l {
|
|
Jan Chaloupka |
ebf376 |
--
|
|
Jan Chaloupka |
ebf376 |
1.9.3
|
|
Jan Chaloupka |
ebf376 |
|