mirror of
				https://github.com/opencontainers/runc.git
				synced 2025-10-31 19:13:12 +08:00 
			
		
		
		
	build(deps): bump github.com/cilium/ebpf from 0.9.3 to 0.10.0
Bumps [github.com/cilium/ebpf](https://github.com/cilium/ebpf) from 0.9.3 to 0.10.0. - [Release notes](https://github.com/cilium/ebpf/releases) - [Commits](https://github.com/cilium/ebpf/compare/v0.9.3...v0.10.0) --- updated-dependencies: - dependency-name: github.com/cilium/ebpf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
		
							
								
								
									
										23
									
								
								vendor/github.com/cilium/ebpf/internal/errors.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										23
									
								
								vendor/github.com/cilium/ebpf/internal/errors.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @@ -12,7 +12,7 @@ import ( | ||||
| // | ||||
| // The default error output is a summary of the full log. The latter can be | ||||
| // accessed via VerifierError.Log or by formatting the error, see Format. | ||||
| func ErrorWithLog(err error, log []byte, truncated bool) *VerifierError { | ||||
| func ErrorWithLog(source string, err error, log []byte, truncated bool) *VerifierError { | ||||
| 	const whitespace = "\t\r\v\n " | ||||
|  | ||||
| 	// Convert verifier log C string by truncating it on the first 0 byte | ||||
| @@ -23,7 +23,7 @@ func ErrorWithLog(err error, log []byte, truncated bool) *VerifierError { | ||||
|  | ||||
| 	log = bytes.Trim(log, whitespace) | ||||
| 	if len(log) == 0 { | ||||
| 		return &VerifierError{err, nil, truncated} | ||||
| 		return &VerifierError{source, err, nil, truncated} | ||||
| 	} | ||||
|  | ||||
| 	logLines := bytes.Split(log, []byte{'\n'}) | ||||
| @@ -34,13 +34,14 @@ func ErrorWithLog(err error, log []byte, truncated bool) *VerifierError { | ||||
| 		lines = append(lines, string(bytes.TrimRight(line, whitespace))) | ||||
| 	} | ||||
|  | ||||
| 	return &VerifierError{err, lines, truncated} | ||||
| 	return &VerifierError{source, err, lines, truncated} | ||||
| } | ||||
|  | ||||
| // VerifierError includes information from the eBPF verifier. | ||||
| // | ||||
| // It summarises the log output, see Format if you want to output the full contents. | ||||
| type VerifierError struct { | ||||
| 	source string | ||||
| 	// The error which caused this error. | ||||
| 	Cause error | ||||
| 	// The verifier output split into lines. | ||||
| @@ -60,9 +61,12 @@ func (le *VerifierError) Error() string { | ||||
| 		log = log[:n-1] | ||||
| 	} | ||||
|  | ||||
| 	var b strings.Builder | ||||
| 	fmt.Fprintf(&b, "%s: %s", le.source, le.Cause.Error()) | ||||
|  | ||||
| 	n := len(log) | ||||
| 	if n == 0 { | ||||
| 		return le.Cause.Error() | ||||
| 		return b.String() | ||||
| 	} | ||||
|  | ||||
| 	lines := log[n-1:] | ||||
| @@ -71,14 +75,9 @@ func (le *VerifierError) Error() string { | ||||
| 		lines = log[n-2:] | ||||
| 	} | ||||
|  | ||||
| 	var b strings.Builder | ||||
| 	fmt.Fprintf(&b, "%s: ", le.Cause.Error()) | ||||
|  | ||||
| 	for i, line := range lines { | ||||
| 	for _, line := range lines { | ||||
| 		b.WriteString(": ") | ||||
| 		b.WriteString(strings.TrimSpace(line)) | ||||
| 		if i != len(lines)-1 { | ||||
| 			b.WriteString(": ") | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	omitted := len(le.Log) - len(lines) | ||||
| @@ -167,7 +166,7 @@ func (le *VerifierError) Format(f fmt.State, verb rune) { | ||||
| 			return | ||||
| 		} | ||||
|  | ||||
| 		fmt.Fprintf(f, "%s:", le.Cause.Error()) | ||||
| 		fmt.Fprintf(f, "%s: %s:", le.source, le.Cause.Error()) | ||||
|  | ||||
| 		omitted := len(le.Log) - n | ||||
| 		lines := le.Log[:n] | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	![49699333+dependabot[bot]@users.noreply.github.com](/assets/img/avatar_default.png) dependabot[bot]
					dependabot[bot]