vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

pkg: mount: golint

Browse source 
Fix the following warnings:

pkg/mount/mountinfo.go:5:6: type name will be used as mount.MountInfo by other packages, and that stutters; consider calling this Info
pkg/mount/mountinfo.go:7:2: struct field Id should be ID

Signed-off-by: Antonio Murdaca <runcom@linux.com>
This commit is contained in:
Antonio Murdaca 2015-07-21 19:49:42 +02:00
parent 64ddf3420c
commit 056158ea4c
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mount/mount.go
View file

@ -5,7 +5,7 @@ import (
) )
// GetMounts retrieves a list of mounts for the current running process. // GetMounts retrieves a list of mounts for the current running process.
func GetMounts() ([]*MountInfo, error) { func GetMounts() ([]*Info, error) {
return parseMountTable() return parseMountTable()
} }

8
mount/mountinfo.go
View file

@ -1,10 +1,10 @@
package mount package mount
// MountInfo reveals information about a particular mounted filesystem. This // Info reveals information about a particular mounted filesystem. This
// struct is populated from the content in the /proc/<pid>/mountinfo file. // struct is populated from the content in the /proc/<pid>/mountinfo file.
type MountInfo struct { type Info struct {
// Id is a unique identifier of the mount (may be reused after umount). // ID is a unique identifier of the mount (may be reused after umount).
Id int ID int
// Parent indicates the ID of the mount parent (or of self for the top of the // Parent indicates the ID of the mount parent (or of self for the top of the
// mount tree). // mount tree).

6
mount/mountinfo_freebsd.go
View file

@ -15,7 +15,7 @@ import (
// Parse /proc/self/mountinfo because comparing Dev and ino does not work from // Parse /proc/self/mountinfo because comparing Dev and ino does not work from
// bind mounts. // bind mounts.
func parseMountTable() ([]*MountInfo, error) { func parseMountTable() ([]*Info, error) {
var rawEntries *C.struct_statfs var rawEntries *C.struct_statfs
count := int(C.getmntinfo(&rawEntries, C.MNT_WAIT)) count := int(C.getmntinfo(&rawEntries, C.MNT_WAIT))
@ -29,9 +29,9 @@ func parseMountTable() ([]*MountInfo, error) {
header.Len = count header.Len = count
header.Data = uintptr(unsafe.Pointer(rawEntries)) header.Data = uintptr(unsafe.Pointer(rawEntries))
var out []*MountInfo var out []*Info
for _, entry := range entries { for _, entry := range entries {
var mountinfo MountInfo var mountinfo Info
mountinfo.Mountpoint = C.GoString(&entry.f_mntonname[0]) mountinfo.Mountpoint = C.GoString(&entry.f_mntonname[0])
mountinfo.Source = C.GoString(&entry.f_mntfromname[0]) mountinfo.Source = C.GoString(&entry.f_mntfromname[0])
mountinfo.Fstype = C.GoString(&entry.f_fstypename[0]) mountinfo.Fstype = C.GoString(&entry.f_fstypename[0])

12
mount/mountinfo_linux.go
View file

@ -30,7 +30,7 @@ const (
// Parse /proc/self/mountinfo because comparing Dev and ino does not work from // Parse /proc/self/mountinfo because comparing Dev and ino does not work from
// bind mounts // bind mounts
func parseMountTable() ([]*MountInfo, error) { func parseMountTable() ([]*Info, error) {
f, err := os.Open("/proc/self/mountinfo") f, err := os.Open("/proc/self/mountinfo")
if err != nil { if err != nil {
return nil, err return nil, err
@ -40,10 +40,10 @@ func parseMountTable() ([]*MountInfo, error) {
return parseInfoFile(f) return parseInfoFile(f)
} }
func parseInfoFile(r io.Reader) ([]*MountInfo, error) { func parseInfoFile(r io.Reader) ([]*Info, error) {
var ( var (
s = bufio.NewScanner(r) s = bufio.NewScanner(r)
out = []*MountInfo{} out = []*Info{}
) )
for s.Scan() { for s.Scan() {
@ -52,13 +52,13 @@ func parseInfoFile(r io.Reader) ([]*MountInfo, error) {
} }
var ( var (
p = &MountInfo{} p = &Info{}
text = s.Text() text = s.Text()
optionalFields string optionalFields string
) )
if _, err := fmt.Sscanf(text, mountinfoFormat, if _, err := fmt.Sscanf(text, mountinfoFormat,
&p.Id, &p.Parent, &p.Major, &p.Minor, &p.ID, &p.Parent, &p.Major, &p.Minor,
&p.Root, &p.Mountpoint, &p.Opts, &optionalFields); err != nil { &p.Root, &p.Mountpoint, &p.Opts, &optionalFields); err != nil {
return nil, fmt.Errorf("Scanning '%s' failed: %s", text, err) return nil, fmt.Errorf("Scanning '%s' failed: %s", text, err)
} }
@ -84,7 +84,7 @@ func parseInfoFile(r io.Reader) ([]*MountInfo, error) {
// PidMountInfo collects the mounts for a specific process ID. If the process // PidMountInfo collects the mounts for a specific process ID. If the process
// ID is unknown, it is better to use `GetMounts` which will inspect // ID is unknown, it is better to use `GetMounts` which will inspect
// "/proc/self/mountinfo" instead. // "/proc/self/mountinfo" instead.
func PidMountInfo(pid int) ([]*MountInfo, error) { func PidMountInfo(pid int) ([]*Info, error) {
f, err := os.Open(fmt.Sprintf("/proc/%d/mountinfo", pid)) f, err := os.Open(fmt.Sprintf("/proc/%d/mountinfo", pid))
if err != nil { if err != nil {
return nil, err return nil, err

4
mount/mountinfo_linux_test.go
View file

@ -457,8 +457,8 @@ func TestParseFedoraMountinfoFields(t *testing.T) {
if len(infos) != expectedLength { if len(infos) != expectedLength {
t.Fatalf("Expected %d entries, got %d", expectedLength, len(infos)) t.Fatalf("Expected %d entries, got %d", expectedLength, len(infos))
} }
mi := MountInfo{ mi := Info{
Id: 15, ID: 15,
Parent: 35, Parent: 35,
Major: 0, Major: 0,
Minor: 3, Minor: 3,

2
mount/mountinfo_unsupported.go
View file

@ -7,6 +7,6 @@ import (
"runtime" "runtime"
) )
func parseMountTable() ([]*MountInfo, error) { func parseMountTable() ([]*Info, error) {
return nil, fmt.Errorf("mount.parseMountTable is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH) return nil, fmt.Errorf("mount.parseMountTable is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
} }