diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/configfile/config_file.go | 6 | ||||
| -rw-r--r-- | internal/fusefrontend/file_holes.go | 5 | ||||
| -rw-r--r-- | internal/fusefrontend_reverse/reverse_longnames.go | 5 | ||||
| -rw-r--r-- | internal/prefer_openssl/prefer_test.go | 4 | ||||
| -rw-r--r-- | internal/stupidgcm/stupidgcm_test.go | 6 |
5 files changed, 7 insertions, 19 deletions
diff --git a/internal/configfile/config_file.go b/internal/configfile/config_file.go index 74f506f..fab74a6 100644 --- a/internal/configfile/config_file.go +++ b/internal/configfile/config_file.go @@ -198,9 +198,5 @@ func (cf *ConfFile) WriteFile() error { return err } err = os.Rename(tmp, cf.filename) - if err != nil { - return err - } - - return nil + return err } diff --git a/internal/fusefrontend/file_holes.go b/internal/fusefrontend/file_holes.go index 1d9a5fb..34f702f 100644 --- a/internal/fusefrontend/file_holes.go +++ b/internal/fusefrontend/file_holes.go @@ -12,10 +12,7 @@ import ( func (f *file) createsHole(plainSize uint64, off int64) bool { nextBlock := f.contentEnc.PlainOffToBlockNo(plainSize) targetBlock := f.contentEnc.PlainOffToBlockNo(uint64(off)) - if targetBlock > nextBlock { - return true - } - return false + return targetBlock > nextBlock } // Zero-pad the file of size plainSize to the next block boundary diff --git a/internal/fusefrontend_reverse/reverse_longnames.go b/internal/fusefrontend_reverse/reverse_longnames.go index 9c45fe8..6409d95 100644 --- a/internal/fusefrontend_reverse/reverse_longnames.go +++ b/internal/fusefrontend_reverse/reverse_longnames.go @@ -17,11 +17,6 @@ const ( shortNameMax = 176 ) -type dirIVNameStruct struct { - dirIV [nametransform.DirIVLen]byte - name string -} - var longnameParentCache map[string]string var longnameCacheLock sync.Mutex diff --git a/internal/prefer_openssl/prefer_test.go b/internal/prefer_openssl/prefer_test.go index a2ed737..289a0a9 100644 --- a/internal/prefer_openssl/prefer_test.go +++ b/internal/prefer_openssl/prefer_test.go @@ -10,14 +10,14 @@ func TestCurrentCPU(t *testing.T) { // Has AES instructions func TestXeonE312xx(t *testing.T) { - if filePreferOpenSSL("cpuinfo.xeon_e312xx.txt") == true { + if filePreferOpenSSL("cpuinfo.xeon_e312xx.txt") { t.Fail() } } // Pentium G do not have AES instructions func TestPentiumG630(t *testing.T) { - if filePreferOpenSSL("cpuinfo.pentium_g630.txt") == false { + if !filePreferOpenSSL("cpuinfo.pentium_g630.txt") { t.Fail() } } diff --git a/internal/stupidgcm/stupidgcm_test.go b/internal/stupidgcm/stupidgcm_test.go index 82516b3..b0e25ab 100644 --- a/internal/stupidgcm/stupidgcm_test.go +++ b/internal/stupidgcm/stupidgcm_test.go @@ -52,7 +52,7 @@ func TestEncryptDecrypt(t *testing.T) { gOut := gGCM.Seal(dst, iv, in, authData) // Ciphertext must be identical to Go GCM - if bytes.Compare(sOut, gOut) != 0 { + if !bytes.Equal(sOut, gOut) { t.Fatalf("Compare failed for encryption, size %d", i) t.Log("sOut:") t.Log("\n" + hex.Dump(sOut)) @@ -70,7 +70,7 @@ func TestEncryptDecrypt(t *testing.T) { } // Plaintext must be identical to Go GCM - if bytes.Compare(sOut2, gOut2) != 0 { + if !bytes.Equal(sOut2, gOut2) { t.Fatalf("Compare failed for decryption, size %d", i) } } @@ -90,7 +90,7 @@ func TestCorruption(t *testing.T) { if sErr != nil { t.Fatal(sErr) } - if bytes.Compare(in, sOut2) != 0 { + if !bytes.Equal(in, sOut2) { t.Fatalf("Compare failed") } |