diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-02 06:13:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 06:13:25 -0400 |
| commit | 00c7b493a0565205aa054be7708281874163c85d (patch) | |
| tree | ef43b932450ef34f26ae3b8d1dda53aab752c760 /vendor/google.golang.org/protobuf/proto/decode.go | |
| parent | 0b7b22243798650841cd9b790809a0a482f4cbcb (diff) | |
| parent | 5aead1509c681de533b8966e781e15327fe35ab6 (diff) | |
| download | podman-00c7b493a0565205aa054be7708281874163c85d.tar.gz podman-00c7b493a0565205aa054be7708281874163c85d.tar.bz2 podman-00c7b493a0565205aa054be7708281874163c85d.zip | |
Merge pull request #7815 from jwhonce/wip/creds_remote
Add X-Registry-Config support
Diffstat (limited to 'vendor/google.golang.org/protobuf/proto/decode.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/proto/decode.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vendor/google.golang.org/protobuf/proto/decode.go b/vendor/google.golang.org/protobuf/proto/decode.go index 4974b16d5..42fc5195e 100644 --- a/vendor/google.golang.org/protobuf/proto/decode.go +++ b/vendor/google.golang.org/protobuf/proto/decode.go @@ -9,6 +9,7 @@ import ( "google.golang.org/protobuf/internal/encoding/messageset" "google.golang.org/protobuf/internal/errors" "google.golang.org/protobuf/internal/flags" + "google.golang.org/protobuf/internal/genid" "google.golang.org/protobuf/internal/pragma" "google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/reflect/protoregistry" @@ -220,13 +221,13 @@ func (o UnmarshalOptions) unmarshalMap(b []byte, wtyp protowire.Type, mapv proto b = b[n:] err = errUnknown switch num { - case 1: + case genid.MapEntry_Key_field_number: key, n, err = o.unmarshalScalar(b, wtyp, keyField) if err != nil { break } haveKey = true - case 2: + case genid.MapEntry_Value_field_number: var v protoreflect.Value v, n, err = o.unmarshalScalar(b, wtyp, valField) if err != nil { |