Use pkg/errors for all errors

thaJeztah · thaJeztah · commit adc4fa217bd8 · 2019-04-02T14:13:23.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/mount/mountinfo_linux.go b/mount/mountinfo_linux.go
@@ -72,15 +72,15 @@ func parseInfoFile(r io.Reader) ([]Info, error) {
 		numFields := len(fields)
 		if numFields < 10 {
 			// should be at least 10 fields
-			return nil, fmt.Errorf("parsing '%s' failed: not enough fields (%d)", text, numFields)
+			return nil, errors.Errorf("parsing '%s' failed: not enough fields (%d)", text, numFields)
 		}
 		p := Info{}
 		// ignore any numbers parsing errors, as there should not be any
 		p.ID, _ = strconv.Atoi(fields[0])
 		p.Parent, _ = strconv.Atoi(fields[1])
 		mm := strings.Split(fields[2], ":")
 		if len(mm) != 2 {
-			return nil, fmt.Errorf("parsing '%s' failed: unexpected minor:major pair %s", text, mm)
+			return nil, errors.Errorf("parsing '%s' failed: unexpected minor:major pair %s", text, mm)
 		}
 		p.Major, _ = strconv.Atoi(mm[0])
 		p.Minor, _ = strconv.Atoi(mm[1])
@@ -111,11 +111,11 @@ func parseInfoFile(r io.Reader) ([]Info, error) {
 			}
 		}
 		if i == numFields {
-			return nil, fmt.Errorf("parsing '%s' failed: missing separator ('-')", text)
+			return nil, errors.Errorf("parsing '%s' failed: missing separator ('-')", text)
 		}
 		// There should be 3 fields after the separator...
 		if i+4 > numFields {
-			return nil, fmt.Errorf("parsing '%s' failed: not enough fields after a separator", text)
+			return nil, errors.Errorf("parsing '%s' failed: not enough fields after a separator", text)
 		}
 		// ... but in Linux <= 3.9 mounting a cifs with spaces in a share name
 		// (like "//serv/My Documents") _may_ end up having a space in the last field

Original file line number	Diff line number	Diff line change
`@@ -72,15 +72,15 @@ func parseInfoFile(r io.Reader) ([]Info, error) {`
`72`	`72`	`numFields := len(fields)`
`73`	`73`	`if numFields < 10 {`
`74`	`74`	`// should be at least 10 fields`
`75`		`- return nil, fmt.Errorf("parsing '%s' failed: not enough fields (%d)", text, numFields)`
	`75`	`+ return nil, errors.Errorf("parsing '%s' failed: not enough fields (%d)", text, numFields)`
`76`	`76`	`}`
`77`	`77`	`p := Info{}`
`78`	`78`	`// ignore any numbers parsing errors, as there should not be any`
`79`	`79`	`p.ID, _ = strconv.Atoi(fields[0])`
`80`	`80`	`p.Parent, _ = strconv.Atoi(fields[1])`
`81`	`81`	`mm := strings.Split(fields[2], ":")`
`82`	`82`	`if len(mm) != 2 {`
`83`		`- return nil, fmt.Errorf("parsing '%s' failed: unexpected minor:major pair %s", text, mm)`
	`83`	`+ return nil, errors.Errorf("parsing '%s' failed: unexpected minor:major pair %s", text, mm)`
`84`	`84`	`}`
`85`	`85`	`p.Major, _ = strconv.Atoi(mm[0])`
`86`	`86`	`p.Minor, _ = strconv.Atoi(mm[1])`
`@@ -111,11 +111,11 @@ func parseInfoFile(r io.Reader) ([]Info, error) {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`if i == numFields {`
`114`		`- return nil, fmt.Errorf("parsing '%s' failed: missing separator ('-')", text)`
	`114`	`+ return nil, errors.Errorf("parsing '%s' failed: missing separator ('-')", text)`
`115`	`115`	`}`
`116`	`116`	`// There should be 3 fields after the separator...`
`117`	`117`	`if i+4 > numFields {`
`118`		`- return nil, fmt.Errorf("parsing '%s' failed: not enough fields after a separator", text)`
	`118`	`+ return nil, errors.Errorf("parsing '%s' failed: not enough fields after a separator", text)`
`119`	`119`	`}`
`120`	`120`	`// ... but in Linux <= 3.9 mounting a cifs with spaces in a share name`
`121`	`121`	`// (like "//serv/My Documents") _may_ end up having a space in the last field`