diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-20 12:06:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-20 12:06:52 +0100 |
commit | a6976c9ca8346331001dfade295173ad1482c2f6 (patch) | |
tree | eae48e206f340a2695b1f54582fb3b28fc7cad2d /vendor/github.com/rootless-containers/rootlesskit/pkg/msgutil/msgutil.go | |
parent | 2755d0255c94ac2ef797636935f83e3351d4d5af (diff) | |
parent | 44b240470270021e2680afe9de62e5096067a1bf (diff) | |
download | podman-a6976c9ca8346331001dfade295173ad1482c2f6.tar.gz podman-a6976c9ca8346331001dfade295173ad1482c2f6.tar.bz2 podman-a6976c9ca8346331001dfade295173ad1482c2f6.zip |
Merge pull request #12216 from containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.14.6
Bump github.com/rootless-containers/rootlesskit from 0.14.5 to 0.14.6
Diffstat (limited to 'vendor/github.com/rootless-containers/rootlesskit/pkg/msgutil/msgutil.go')
-rw-r--r-- | vendor/github.com/rootless-containers/rootlesskit/pkg/msgutil/msgutil.go | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/msgutil/msgutil.go b/vendor/github.com/rootless-containers/rootlesskit/pkg/msgutil/msgutil.go index a0a0c94c6..74caa9a49 100644 --- a/vendor/github.com/rootless-containers/rootlesskit/pkg/msgutil/msgutil.go +++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/msgutil/msgutil.go @@ -5,9 +5,8 @@ import ( "bytes" "encoding/binary" "encoding/json" + "fmt" "io" - - "github.com/pkg/errors" ) const ( @@ -20,7 +19,7 @@ func MarshalToWriter(w io.Writer, x interface{}) (int, error) { return 0, err } if len(b) > maxLength { - return 0, errors.Errorf("bad message length: %d (max: %d)", len(b), maxLength) + return 0, fmt.Errorf("bad message length: %d (max: %d)", len(b), maxLength) } h := make([]byte, 4) binary.LittleEndian.PutUint32(h, uint32(len(b))) @@ -34,11 +33,11 @@ func UnmarshalFromReader(r io.Reader, x interface{}) (int, error) { return n, err } if n != 4 { - return n, errors.Errorf("read %d bytes, expected 4 bytes", n) + return n, fmt.Errorf("read %d bytes, expected 4 bytes", n) } bLen := binary.LittleEndian.Uint32(hdr) if bLen > maxLength || bLen < 1 { - return n, errors.Errorf("bad message length: %d (max: %d)", bLen, maxLength) + return n, fmt.Errorf("bad message length: %d (max: %d)", bLen, maxLength) } b := make([]byte, bLen) n, err = r.Read(b) @@ -46,7 +45,7 @@ func UnmarshalFromReader(r io.Reader, x interface{}) (int, error) { return 4 + n, err } if n != int(bLen) { - return 4 + n, errors.Errorf("read %d bytes, expected %d bytes", n, bLen) + return 4 + n, fmt.Errorf("read %d bytes, expected %d bytes", n, bLen) } return 4 + n, json.Unmarshal(b, x) } @@ -60,7 +59,7 @@ func Marshal(x interface{}) ([]byte, error) { func Unmarshal(b []byte, x interface{}) error { n, err := UnmarshalFromReader(bytes.NewReader(b), x) if n != len(b) { - return errors.Errorf("read %d bytes, expected %d bytes", n, len(b)) + return fmt.Errorf("read %d bytes, expected %d bytes", n, len(b)) } return err } |