aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/csource
diff options
context:
space:
mode:
authorTaras Madan <tarasmadan@google.com>2023-07-21 11:54:11 +0200
committerTaras Madan <tarasmadan@google.com>2023-07-24 09:12:13 +0000
commit7549a7e1b57831cf6b08ce4700fc6e53417919f9 (patch)
tree8e027cdaf7abbc52a5fb29c37c7137dfd2122e7a /pkg/csource
parentf7eecac8b446ef11cff4122de6f496ad5eaba3a9 (diff)
all: use special placeholder for errors
Diffstat (limited to 'pkg/csource')
-rw-r--r--pkg/csource/build.go2
-rw-r--r--pkg/csource/common.go2
-rw-r--r--pkg/csource/csource.go4
3 files changed, 4 insertions, 4 deletions
diff --git a/pkg/csource/build.go b/pkg/csource/build.go
index af41f66d3..35d97d023 100644
--- a/pkg/csource/build.go
+++ b/pkg/csource/build.go
@@ -83,7 +83,7 @@ func Format(src []byte) ([]byte, error) {
cmd.Stdout = stdout
cmd.Stderr = stderr
if err := cmd.Run(); err != nil {
- return src, fmt.Errorf("failed to format source: %v\n%v", err, stderr.String())
+ return src, fmt.Errorf("failed to format source: %w\n%v", err, stderr.String())
}
return stdout.Bytes(), nil
}
diff --git a/pkg/csource/common.go b/pkg/csource/common.go
index 3b30d85f4..2d62f0707 100644
--- a/pkg/csource/common.go
+++ b/pkg/csource/common.go
@@ -48,7 +48,7 @@ func createCommonHeader(p, mmapProg *prog.Prog, replacements map[string]string,
// 3776 | #if not SYZ_SANDBOX_ANDROID
// Potentially we could analyze errors manually and ignore only the expected ones.
if err := cmd.Run(); len(stdout.Bytes()) == 0 {
- return nil, fmt.Errorf("cpp failed: %v %v: %v\n%v\n%v", cmd.Path, cmd.Args, err, stdout.String(), stderr.String())
+ return nil, fmt.Errorf("cpp failed: %v %v: %w\n%v\n%v", cmd.Path, cmd.Args, err, stdout.String(), stderr.String())
}
src, err := removeSystemDefines(stdout.Bytes(), defines)
diff --git a/pkg/csource/csource.go b/pkg/csource/csource.go
index 54cf2fa39..a56a738c5 100644
--- a/pkg/csource/csource.go
+++ b/pkg/csource/csource.go
@@ -39,7 +39,7 @@ import (
// Write generates C source for program p based on the provided options opt.
func Write(p *prog.Prog, opts Options) ([]byte, error) {
if err := opts.Check(p.Target.OS); err != nil {
- return nil, fmt.Errorf("csource: invalid opts: %v", err)
+ return nil, fmt.Errorf("csource: invalid opts: %w", err)
}
ctx := &context{
p: p,
@@ -241,7 +241,7 @@ func (ctx *context) generateProgCalls(p *prog.Prog, trace bool) ([]string, []uin
exec := make([]byte, prog.ExecBufferSize)
progSize, err := p.SerializeForExec(exec)
if err != nil {
- return nil, nil, fmt.Errorf("failed to serialize program: %v", err)
+ return nil, nil, fmt.Errorf("failed to serialize program: %w", err)
}
decoded, err := ctx.target.DeserializeExec(exec[:progSize])
if err != nil {