aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cli_args.go2
-rw-r--r--contrib/atomicrename/main.go2
-rw-r--r--contrib/findholes/holes/holes.go2
-rw-r--r--internal/cryptocore/randsize_test.go2
-rw-r--r--internal/fusefrontend/file.go4
-rw-r--r--internal/inomap/inomap.go4
-rw-r--r--internal/nametransform/badname.go2
-rw-r--r--internal/stupidgcm/openssl.go2
-rw-r--r--internal/stupidgcm/prefer.go2
-rw-r--r--tests/cli/cli_test.go2
-rw-r--r--tests/example_filesystems/example_filesystems_test.go2
11 files changed, 13 insertions, 13 deletions
diff --git a/cli_args.go b/cli_args.go
index 781dc5c..91bd56e 100644
--- a/cli_args.go
+++ b/cli_args.go
@@ -334,7 +334,7 @@ func countOpFlags(args *argContainer) int {
return count
}
-// isFlagPassed finds out if the flag was explictely passed on the command line.
+// isFlagPassed finds out if the flag was explicitly passed on the command line.
// https://stackoverflow.com/a/54747682/1380267
func isFlagPassed(flagSet *flag.FlagSet, name string) bool {
found := false
diff --git a/contrib/atomicrename/main.go b/contrib/atomicrename/main.go
index 67088b0..394753b 100644
--- a/contrib/atomicrename/main.go
+++ b/contrib/atomicrename/main.go
@@ -26,7 +26,7 @@ func usage() {
them in random order over a single "dst" file while reading the "dst"
file concurrently in a loop.
-Progress and errors are reported as they occour in addition to a summary
+Progress and errors are reported as they occur in addition to a summary
printed at the end. cifs and fuse filesystems are known to fail, local
filesystems and nfs seem ok.
diff --git a/contrib/findholes/holes/holes.go b/contrib/findholes/holes/holes.go
index 307c624..95c9d2b 100644
--- a/contrib/findholes/holes/holes.go
+++ b/contrib/findholes/holes/holes.go
@@ -153,7 +153,7 @@ func Verify(fd int, segments []Segment) (err error) {
case SegmentEOF:
continue
default:
- log.Panicf("BUG: unkown segment type %d", s.Type)
+ log.Panicf("BUG: unknown segment type %d", s.Type)
}
for off := s.Offset; off < segments[i+1].Offset; off++ {
res, err := syscall.Seek(fd, off, whence)
diff --git a/internal/cryptocore/randsize_test.go b/internal/cryptocore/randsize_test.go
index 1db4745..ed91d4f 100644
--- a/internal/cryptocore/randsize_test.go
+++ b/internal/cryptocore/randsize_test.go
@@ -10,7 +10,7 @@ import (
)
/*
-The troughput we get from /dev/urandom / getentropy depends a lot on the used
+The throughput we get from /dev/urandom / getentropy depends a lot on the used
block size. Results on my Pentium G630 running Linux 4.11:
BenchmarkRandSize/16-2 3000000 571 ns/op 27.98 MB/s
diff --git a/internal/fusefrontend/file.go b/internal/fusefrontend/file.go
index 3ce1b1e..2f111fd 100644
--- a/internal/fusefrontend/file.go
+++ b/internal/fusefrontend/file.go
@@ -207,8 +207,8 @@ func (f *File) doRead(dst []byte, off uint64, length uint64) ([]byte, syscall.Er
plaintext, err := f.contentEnc.DecryptBlocks(ciphertext, firstBlockNo, fileID)
f.rootNode.contentEnc.CReqPool.Put(ciphertext)
if err != nil {
- curruptBlockNo := firstBlockNo + f.contentEnc.PlainOffToBlockNo(uint64(len(plaintext)))
- tlog.Warn.Printf("doRead %d: corrupt block #%d: %v", f.qIno.Ino, curruptBlockNo, err)
+ corruptBlockNo := firstBlockNo + f.contentEnc.PlainOffToBlockNo(uint64(len(plaintext)))
+ tlog.Warn.Printf("doRead %d: corrupt block #%d: %v", f.qIno.Ino, corruptBlockNo, err)
return nil, syscall.EIO
}
diff --git a/internal/inomap/inomap.go b/internal/inomap/inomap.go
index 997ea9b..070fab4 100644
--- a/internal/inomap/inomap.go
+++ b/internal/inomap/inomap.go
@@ -9,7 +9,7 @@
// Each (Dev, Tag) tuple gets a namespace id assigned. The original inode
// number is then passed through in the lower 48 bits.
//
-// If namespace ids are exhaused, or the original id is larger than 48 bits,
+// If namespace ids are exhausted, or the original id is larger than 48 bits,
// the whole (Dev, Tag, Ino) tuple gets mapped in the spill map, and the
// spill bit is set to 1.
package inomap
@@ -114,7 +114,7 @@ func (m *InoMap) Translate(in QIno) (out uint64) {
// TranslateStat translates (device, ino) pair contained in "st" into a unique
// inode number and overwrites the ino in "st" with it.
-// Convience wrapper around Translate().
+// Convenience wrapper around Translate().
func (m *InoMap) TranslateStat(st *syscall.Stat_t) {
in := QInoFromStat(st)
st.Ino = m.Translate(in)
diff --git a/internal/nametransform/badname.go b/internal/nametransform/badname.go
index 6e77561..28bc028 100644
--- a/internal/nametransform/badname.go
+++ b/internal/nametransform/badname.go
@@ -34,7 +34,7 @@ func (be *NameTransform) EncryptAndHashBadName(name string, iv []byte, dirfd int
//file found, return result
return lastFoundName, nil
}
- //BadName Mode: check if the name was tranformed without change (badname suffix and undecryptable cipher name)
+ //BadName Mode: check if the name was transformed without change (badname suffix and undecryptable cipher name)
err = syscallcompat.Fstatat(dirfd, name[:len(name)-len(BadnameSuffix)], &st, unix.AT_SYMLINK_NOFOLLOW)
if err == nil {
filesFound++
diff --git a/internal/stupidgcm/openssl.go b/internal/stupidgcm/openssl.go
index ae0ee5c..b46fba8 100644
--- a/internal/stupidgcm/openssl.go
+++ b/internal/stupidgcm/openssl.go
@@ -117,7 +117,7 @@ func slicePointerOrNull(s []byte) (ptr *C.uchar) {
}
// This functions exists to benchmark the C call overhead from Go.
-// See BenchmarkCCall for resuts.
+// See BenchmarkCCall for results.
func noopCFunction() {
C.noop_c_function()
}
diff --git a/internal/stupidgcm/prefer.go b/internal/stupidgcm/prefer.go
index bb613c3..fe8c613 100644
--- a/internal/stupidgcm/prefer.go
+++ b/internal/stupidgcm/prefer.go
@@ -40,7 +40,7 @@ func PreferOpenSSLXchacha20poly1305() bool {
if runtime.GOARCH == "amd64" {
return false
}
- // On arm64 and arm, OpenSSL is faster. Probably everwhere else too.
+ // On arm64 and arm, OpenSSL is faster. Probably everywhere else too.
return true
}
diff --git a/tests/cli/cli_test.go b/tests/cli/cli_test.go
index 915759d..fc2bfed 100644
--- a/tests/cli/cli_test.go
+++ b/tests/cli/cli_test.go
@@ -951,7 +951,7 @@ func TestInitNotEmpty(t *testing.T) {
}
// TestSharedstorage checks that `-sharedstorage` shows stable inode numbers to
-// userpsace despite having hard link tracking disabled
+// userspace despite having hard link tracking disabled
func TestSharedstorage(t *testing.T) {
dir := test_helpers.InitFS(t)
mnt := dir + ".mnt"
diff --git a/tests/example_filesystems/example_filesystems_test.go b/tests/example_filesystems/example_filesystems_test.go
index 37820b5..a5f0595 100644
--- a/tests/example_filesystems/example_filesystems_test.go
+++ b/tests/example_filesystems/example_filesystems_test.go
@@ -333,7 +333,7 @@ func TestExampleFSv13reverse(t *testing.T) {
}
dirA = tmpFsPath + dirA
// Mount using password
- // We pass "-wpanic=false" because the '..' and '.' tests deliverately trigger warnings
+ // We pass "-wpanic=false" because the '..' and '.' tests deliberately trigger warnings
test_helpers.MountOrFatal(t, dirA, dirB, "-reverse", "-extpass", "echo test", "-wpanic=false", opensslOpt)
c := dirB + "/gocryptfs.conf"
if !test_helpers.VerifyExistence(t, c) {