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/symbolizer/nm.go         | 4 ++--
 pkg/symbolizer/symbolizer.go | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'pkg/symbolizer')

diff --git a/pkg/symbolizer/nm.go b/pkg/symbolizer/nm.go
index 471640b4f..6e0fc9016 100644
--- a/pkg/symbolizer/nm.go
+++ b/pkg/symbolizer/nm.go
@@ -59,11 +59,11 @@ func read(target *targets.Target, bin string, text bool) (map[string][]Symbol, e
 func load(target *targets.Target, bin string, text bool) ([]elf.Symbol, error) {
 	file, err := elf.Open(bin)
 	if err != nil {
-		return nil, fmt.Errorf("failed to open ELF file %v: %v", bin, err)
+		return nil, fmt.Errorf("failed to open ELF file %v: %w", bin, err)
 	}
 	allSymbols, err := file.Symbols()
 	if err != nil {
-		return nil, fmt.Errorf("failed to read ELF symbols: %v", err)
+		return nil, fmt.Errorf("failed to read ELF symbols: %w", err)
 	}
 	var symbols []elf.Symbol
 	for _, symb := range allSymbols {
diff --git a/pkg/symbolizer/symbolizer.go b/pkg/symbolizer/symbolizer.go
index 8cf6c8cf1..fb378d09f 100644
--- a/pkg/symbolizer/symbolizer.go
+++ b/pkg/symbolizer/symbolizer.go
@@ -74,7 +74,7 @@ func (s *Symbolizer) checkBinSupport(addr2line string) error {
 	cmd.Env = append(os.Environ(), "LC_ALL=C")
 	out, err := cmd.CombinedOutput()
 	if err != nil {
-		return fmt.Errorf("addr2line execution failed: %s", err)
+		return fmt.Errorf("addr2line execution failed: %w", err)
 	}
 	if !bytes.Contains(out, []byte("supported targets:")) {
 		return fmt.Errorf("addr2line output didn't contain supported targets")
@@ -174,7 +174,7 @@ func symbolize(input *bufio.Writer, scanner *bufio.Scanner, pcs []uint64) ([]Fra
 func parse(s *bufio.Scanner) ([]Frame, error) {
 	pc, err := strconv.ParseUint(s.Text(), 0, 64)
 	if err != nil {
-		return nil, fmt.Errorf("failed to parse pc '%v' in addr2line output: %v", s.Text(), err)
+		return nil, fmt.Errorf("failed to parse pc '%v' in addr2line output: %w", s.Text(), err)
 	}
 	var frames []Frame
 	for {
@@ -191,7 +191,7 @@ func parse(s *bufio.Scanner) ([]Frame, error) {
 			if err == nil {
 				err = io.EOF
 			}
-			return nil, fmt.Errorf("failed to read file:line from addr2line: %v", err)
+			return nil, fmt.Errorf("failed to read file:line from addr2line: %w", err)
 		}
 		ln = s.Text()
 		colon := strings.LastIndexByte(ln, ':')
-- 
cgit mrf-deployment