diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-21 19:30:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 19:30:10 +0200 |
| commit | 9eb6c3056398c3776018eccd121ac487a9282c36 (patch) | |
| tree | 19b3d53d54b92ae28372b656ab1ff21fe10e645e /vendor/github.com/klauspost | |
| parent | 17553caca453b3ca24ad3e5f1c15ffeaad87030a (diff) | |
| parent | 7ccf5708dac7a2d8d1ea89a5d165f12e11d01131 (diff) | |
| download | podman-9eb6c3056398c3776018eccd121ac487a9282c36.tar.gz podman-9eb6c3056398c3776018eccd121ac487a9282c36.tar.bz2 podman-9eb6c3056398c3776018eccd121ac487a9282c36.zip | |
Merge pull request #6314 from containers/dependabot/go_modules/github.com/containers/storage-1.20.1
Bump github.com/containers/storage from 1.19.2 to 1.20.1
Diffstat (limited to 'vendor/github.com/klauspost')
| -rw-r--r-- | vendor/github.com/klauspost/pgzip/LICENSE | 3 | ||||
| -rw-r--r-- | vendor/github.com/klauspost/pgzip/gzip.go | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/vendor/github.com/klauspost/pgzip/LICENSE b/vendor/github.com/klauspost/pgzip/LICENSE index 2bdc0d751..3909da410 100644 --- a/vendor/github.com/klauspost/pgzip/LICENSE +++ b/vendor/github.com/klauspost/pgzip/LICENSE @@ -1,4 +1,4 @@ -The MIT License (MIT) +MIT License Copyright (c) 2014 Klaus Post @@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/vendor/github.com/klauspost/pgzip/gzip.go b/vendor/github.com/klauspost/pgzip/gzip.go index cb3dc0896..257c4d299 100644 --- a/vendor/github.com/klauspost/pgzip/gzip.go +++ b/vendor/github.com/klauspost/pgzip/gzip.go @@ -405,7 +405,7 @@ func (z *Writer) Write(p []byte) (int, error) { if len(z.currentBuffer) == z.blockSize { z.compressCurrent(false) if err := z.checkError(); err != nil { - return len(p) - len(q) - length, err + return len(p) - len(q), err } } z.size += length |