1
0
Fork 0
mirror of https://github.com/vbatts/go-mtree.git synced 2024-11-22 00:15:39 +00:00

Merge pull request #197 from vbatts/fmt

*.go: `goimports -w .``
This commit is contained in:
Vincent Batts 2023-10-24 09:18:03 -04:00 committed by GitHub
commit 48e5e86700
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 5 deletions

View file

@ -459,7 +459,8 @@ func compare(oldDh, newDh *DirectoryHierarchy, keys []Keyword, same bool) ([]Ino
// InodeDeltas. // InodeDeltas.
// //
// NB: The order of the parameters matters (old, new) because Extra and // NB: The order of the parameters matters (old, new) because Extra and
// Missing are considered as different discrepancy types. //
// Missing are considered as different discrepancy types.
func Compare(oldDh, newDh *DirectoryHierarchy, keys []Keyword) ([]InodeDelta, error) { func Compare(oldDh, newDh *DirectoryHierarchy, keys []Keyword) ([]InodeDelta, error) {
return compare(oldDh, newDh, keys, false) return compare(oldDh, newDh, keys, false)
} }

11
tar.go
View file

@ -229,8 +229,9 @@ hdrloop:
// appropriate position in the tree. If not, create a path up until the Entry's // appropriate position in the tree. If not, create a path up until the Entry's
// directory that it is contained in. Then, insert the Entry. // directory that it is contained in. Then, insert the Entry.
// root: the "." Entry // root: the "." Entry
// e: the Entry we are looking to insert //
// hdr: the tar header struct associated with e // e: the Entry we are looking to insert
// hdr: the tar header struct associated with e
func populateTree(root, e *Entry, hdr *tar.Header) error { func populateTree(root, e *Entry, hdr *tar.Header) error {
if root == nil || e == nil { if root == nil || e == nil {
return fmt.Errorf("cannot populate or insert nil Entry's") return fmt.Errorf("cannot populate or insert nil Entry's")
@ -295,8 +296,10 @@ func populateTree(root, e *Entry, hdr *tar.Header) error {
// After constructing a pseudo file hierarchy tree, we want to "flatten" this // After constructing a pseudo file hierarchy tree, we want to "flatten" this
// tree by putting the Entries into a slice with appropriate positioning. // tree by putting the Entries into a slice with appropriate positioning.
// root: the "head" of the sub-tree to flatten //
// creator: a dhCreator that helps with the '/set' keyword // root: the "head" of the sub-tree to flatten
// creator: a dhCreator that helps with the '/set' keyword
//
// keywords: keywords specified by the user that should be evaluated // keywords: keywords specified by the user that should be evaluated
func flatten(root *Entry, creator *dhCreator, keywords []Keyword) { func flatten(root *Entry, creator *dhCreator, keywords []Keyword) {
if root == nil || creator == nil { if root == nil || creator == nil {

View file

@ -128,6 +128,7 @@ func TestTar(t *testing.T) {
// `tar -cvf some.tar dir1 dir2 dir3 dir4/dir5 dir6` ... etc. // `tar -cvf some.tar dir1 dir2 dir3 dir4/dir5 dir6` ... etc.
// The testdata of collection.tar resemble such an archive. the `collection` folder // The testdata of collection.tar resemble such an archive. the `collection` folder
// is the contents of `collection.tar` extracted // is the contents of `collection.tar` extracted
//
//gocyclo:ignore //gocyclo:ignore
func TestArchiveCreation(t *testing.T) { func TestArchiveCreation(t *testing.T) {
fh, err := os.Open("./testdata/collection.tar") fh, err := os.Open("./testdata/collection.tar")
@ -197,6 +198,7 @@ func TestArchiveCreation(t *testing.T) {
// evaluated. Also, The fact that this archive contains a single entry, yet the // evaluated. Also, The fact that this archive contains a single entry, yet the
// entry is associated with a file that has parent directories, means that the // entry is associated with a file that has parent directories, means that the
// "." directory should be the lowest sub-directory under which `file` is contained. // "." directory should be the lowest sub-directory under which `file` is contained.
//
//gocyclo:ignore //gocyclo:ignore
func TestTreeTraversal(t *testing.T) { func TestTreeTraversal(t *testing.T) {
fh, err := os.Open("./testdata/traversal.tar") fh, err := os.Open("./testdata/traversal.tar")

View file

@ -1,3 +1,4 @@
//go:build linux
// +build linux // +build linux
package xattr package xattr