mirror of
				https://github.com/containers/podman.git
				synced 2025-10-31 10:00:01 +08:00 
			
		
		
		
	Update c/image to v4.0.1 and buildah to 1.11.3
This requires updating all import paths throughout, and a matching buildah update to interoperate. I can't figure out the reason for go.mod tracking github.com/containers/image v3.0.2+incompatible // indirect ((go mod graph) lists it as a direct dependency of libpod, but (go list -json -m all) lists it as an indirect dependency), but at least looking at the vendor subdirectory, it doesn't seem to be actually used in the built binaries. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
		
							
								
								
									
										13
									
								
								vendor/github.com/klauspost/compress/zstd/blockdec.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								vendor/github.com/klauspost/compress/zstd/blockdec.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -63,7 +63,8 @@ var ( | ||||
|  | ||||
| type blockDec struct { | ||||
| 	// Raw source data of the block. | ||||
| 	data []byte | ||||
| 	data        []byte | ||||
| 	dataStorage []byte | ||||
|  | ||||
| 	// Destination of the decoded data. | ||||
| 	dst []byte | ||||
| @ -145,18 +146,18 @@ func (b *blockDec) reset(br byteBuffer, windowSize uint64) error { | ||||
| 	} | ||||
|  | ||||
| 	// Read block data. | ||||
| 	if cap(b.data) < cSize { | ||||
| 	if cap(b.dataStorage) < cSize { | ||||
| 		if b.lowMem { | ||||
| 			b.data = make([]byte, 0, cSize) | ||||
| 			b.dataStorage = make([]byte, 0, cSize) | ||||
| 		} else { | ||||
| 			b.data = make([]byte, 0, maxBlockSize) | ||||
| 			b.dataStorage = make([]byte, 0, maxBlockSize) | ||||
| 		} | ||||
| 	} | ||||
| 	if cap(b.dst) <= maxBlockSize { | ||||
| 		b.dst = make([]byte, 0, maxBlockSize+1) | ||||
| 	} | ||||
| 	var err error | ||||
| 	b.data, err = br.readBig(cSize, b.data[:0]) | ||||
| 	b.data, err = br.readBig(cSize, b.dataStorage) | ||||
| 	if err != nil { | ||||
| 		if debug { | ||||
| 			println("Reading block:", err) | ||||
| @ -447,6 +448,7 @@ func (b *blockDec) decodeCompressed(hist *history) error { | ||||
| 		} | ||||
| 		// Use our out buffer. | ||||
| 		huff.Out = b.literalBuf[:0] | ||||
| 		huff.MaxDecodedSize = litRegenSize | ||||
| 		if fourStreams { | ||||
| 			literals, err = huff.Decompress4X(literals, litRegenSize) | ||||
| 		} else { | ||||
| @ -609,6 +611,7 @@ func (b *blockDec) decodeCompressed(hist *history) error { | ||||
| 		// Use our out buffer. | ||||
| 		huff = hist.huffTree | ||||
| 		huff.Out = b.literalBuf[:0] | ||||
| 		huff.MaxDecodedSize = litRegenSize | ||||
| 		if fourStreams { | ||||
| 			literals, err = huff.Decompress4X(literals, litRegenSize) | ||||
| 		} else { | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Miloslav Trmač
					Miloslav Trmač