Implement changes proposed by gosimple.

Also delete the unused "dirIVNameStruct", found by deadcode.

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 err
-	}
-
-	return nil
 }

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 targetBlock > nextBlock
-		return true
-	}
-	return false
 }
 
 // Zero-pad the file of size plainSize to the next block boundary

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
 

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()
 	}
 }

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")
 	}
 

main.go

@@ -198,7 +198,7 @@ func main() {
 		tlog.Info.Printf("Note: You must unmount gracefully, otherwise the profile file(s) will stay empty!\n")
 	}
 	// "-openssl"
-	if args.openssl == false {
+	if !args.openssl {
 		tlog.Debug.Printf("OpenSSL disabled, using Go GCM")
 	} else {
 		tlog.Debug.Printf("OpenSSL enabled")

tests/matrix/matrix_test.go

@@ -414,17 +414,17 @@ func TestRmwRace(t *testing.T) {
 func TestFiltered(t *testing.T) {
 	filteredFile := test_helpers.DefaultPlainDir + "/gocryptfs.conf"
 	file, err := os.Create(filteredFile)
-	if plaintextnames == true && err == nil {
+	if plaintextnames && err == nil {
 		t.Errorf("should have failed but didn't")
-	} else if plaintextnames == false && err != nil {
+	} else if !plaintextnames && err != nil {
 		t.Error(err)
 	}
 	file.Close()
 
 	err = os.Remove(filteredFile)
-	if plaintextnames == true && err == nil {
+	if plaintextnames && err == nil {
 		t.Errorf("should have failed but didn't")
-	} else if plaintextnames == false && err != nil {
+	} else if !plaintextnames && err != nil {
 		t.Error(err)
 	}
 }
@@ -436,9 +436,9 @@ func TestFilenameEncryption(t *testing.T) {
 		t.Fatal(err)
 	}
 	_, err = os.Stat(test_helpers.DefaultCipherDir + "/TestFilenameEncryption.txt")
-	if plaintextnames == true && err != nil {
+	if plaintextnames && err != nil {
 		t.Errorf("plaintextnames not working: %v", err)
-	} else if plaintextnames == false && err == nil {
+	} else if !plaintextnames && err == nil {
 		t.Errorf("file name encryption not working")
 	}
 }