interfaces/mount: improve go identifier names of mountinfo, parse optional fields #3187

zyga · Apr 13, 2017

No description provided.

stolowski · Apr 13, 2017

stolowski approved these changes Apr 13, 2017

View changes

Yup, looks good, thank you!

Ah, good catch, we apparently missed those in previous PR :}

No, before those were not pointers so I returned an empty object. In this branch, because I added an array into the structure, I now return a pointer to entry.

zyga deleted the zyga:mountinfo-3 branch Apr 13, 2017

@@ -53,53 +53,56 @@ func ParseInfoEntry(s string) (InfoEntry, error) {
          	// 36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue
          	// (1)(2)(3)   (4)   (5)      (6)      (7)   (8) (9)   (10)         (11)
          	if len(fields) < 10 {
-        -		return e, fmt.Errorf("incorrect number of fields, expected at least 10 but found %d", len(fields))
+        +		return nil, fmt.Errorf("incorrect number of fields, expected at least 10 but found %d", len(fields))

snapcore/snapd

interfaces/mount: improve go identifier names of mountinfo, parse optional fields #3187

zyga commented Apr 13, 2017

zyga added some commits Apr 12, 2017

stolowski approved these changes Apr 13, 2017

View changes

zyga merged commit `a9dc415` into snapcore:master Apr 13, 2017
6 checks passed

6 checks passed

zyga deleted the zyga:mountinfo-3 branch Apr 13, 2017

snapcore/snapd

Join GitHub today

interfaces/mount: improve go identifier names of mountinfo, parse optional fields #3187

Conversation

zyga commented Apr 13, 2017

zyga added some commits Apr 12, 2017

All checks have passed

stolowski approved these changes Apr 13, 2017 View changes

stolowski Apr 13, 2017

zyga Apr 13, 2017

Hide details View details zyga merged commit a9dc415 into snapcore:master Apr 13, 2017 6 checks passed

6 checks passed

zyga deleted the zyga:mountinfo-3 branch Apr 13, 2017

stolowski approved these changes Apr 13, 2017

View changes

zyga merged commit `a9dc415` into snapcore:master Apr 13, 2017
6 checks passed