From 7549a7e1b57831cf6b08ce4700fc6e53417919f9 Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Fri, 21 Jul 2023 11:54:11 +0200
Subject: all: use special placeholder for errors

---
 pkg/csource/build.go   | 2 +-
 pkg/csource/common.go  | 2 +-
 pkg/csource/csource.go | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkg/csource')

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 {
-- 
cgit mrf-deployment