Remove return after no-return situation (and other cleanups).

Cleanups:
- Fix header guards to not use reserved names.
- Avoid name shadowing.
- Removed an unused variable found by avoiding name shadowing.

1 files changed, 3 insertions, 3 deletions

diff --git a/auto_tests/encryptsave_test.c b/auto_tests/encryptsave_test.c
index 5841f43f..2a2827da 100644
--- a/auto_tests/encryptsave_test.c
+++ b/auto_tests/encryptsave_test.c
@@ -19,7 +19,7 @@
 #include "../toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h"
 #endif
 
-static unsigned char salt[32] = {0xB1, 0xC2, 0x09, 0xEE, 0x50, 0x6C, 0xF0, 0x20, 0xC4, 0xD6, 0xEB, 0xC0, 0x44, 0x51, 0x3B, 0x60, 0x4B, 0x39, 0x4A, 0xCF, 0x09, 0x53, 0x4F, 0xEA, 0x08, 0x41, 0xFA, 0xCA, 0x66, 0xD2, 0x68, 0x7F};
+static unsigned char test_salt[32] = {0xB1, 0xC2, 0x09, 0xEE, 0x50, 0x6C, 0xF0, 0x20, 0xC4, 0xD6, 0xEB, 0xC0, 0x44, 0x51, 0x3B, 0x60, 0x4B, 0x39, 0x4A, 0xCF, 0x09, 0x53, 0x4F, 0xEA, 0x08, 0x41, 0xFA, 0xCA, 0x66, 0xD2, 0x68, 0x7F};
 static unsigned char known_key[crypto_box_BEFORENMBYTES] = {0x29, 0x36, 0x1c, 0x9e, 0x65, 0xbb, 0x46, 0x8b, 0xde, 0xa1, 0xac, 0xf, 0xd5, 0x11, 0x81, 0xc8, 0x29, 0x28, 0x17, 0x23, 0xa6, 0xc3, 0x6b, 0x77, 0x2e, 0xd7, 0xd3, 0x10, 0xeb, 0xd2, 0xf7, 0xc8};
 static const char *pw = "hunter2";
 static unsigned int pwlen = 7;
@@ -46,7 +46,7 @@ START_TEST(test_known_kdf)
               crypto_box_BEFORENMBYTES,
               pw,
               pwlen,
-              salt,
+              test_salt,
               crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE * 8,
               crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE);
     ck_assert_msg(res != -1, "crypto function failed");
@@ -103,7 +103,7 @@ START_TEST(test_save_friend)
     uint8_t data2[size];
     tox_get_savedata(tox3, data2);
     TOX_PASS_KEY key;
-    memcpy(key.salt, salt, 32);
+    memcpy(key.salt, test_salt, 32);
     memcpy(key.key, known_key2, crypto_box_BEFORENMBYTES);
     size2 = size + TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
     uint8_t encdata2[size2];