From 2d0d4b06b1f132c7620a2b11cd1b48b706b03ac8 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 11 Jul 2015 01:50:27 +0200 Subject: Linux: Solve compilation warning (unused variables, pointer cast) --- src/Common/Pkcs5.c | 2 +- src/Main/GraphicUserInterface.cpp | 3 --- src/Main/TextUserInterface.cpp | 3 --- src/Volume/Volume.cpp | 3 --- 4 files changed, 1 insertion(+), 10 deletions(-) (limited to 'src') diff --git a/src/Common/Pkcs5.c b/src/Common/Pkcs5.c index ea0a9874..ef263db7 100644 --- a/src/Common/Pkcs5.c +++ b/src/Common/Pkcs5.c @@ -401,7 +401,7 @@ typedef struct hmac_ripemd160_ctx_struct void hmac_ripemd160_internal (char *key, int keylen, char *input_digest, int len, hmac_ripemd160_ctx* hmac) { RMD160_CTX* context = &(hmac->context); - unsigned char* k_pad = hmac->k_pad; /* inner/outer padding - key XORd with ipad */ + unsigned char* k_pad = (unsigned char*) hmac->k_pad; /* inner/outer padding - key XORd with ipad */ int i; /* diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index 014978a1..94a77cbf 100644 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -1392,19 +1392,16 @@ namespace VeraCrypt File backupFile; backupFile.Open (*files.front(), File::OpenRead); - uint64 headerSize; bool legacyBackup; // Determine the format of the backup file switch (backupFile.Length()) { case TC_VOLUME_HEADER_GROUP_SIZE: - headerSize = TC_VOLUME_HEADER_SIZE; legacyBackup = false; break; case TC_VOLUME_HEADER_SIZE_LEGACY * 2: - headerSize = TC_VOLUME_HEADER_SIZE_LEGACY; legacyBackup = true; break; diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp index 50153eb9..0bf3485e 100644 --- a/src/Main/TextUserInterface.cpp +++ b/src/Main/TextUserInterface.cpp @@ -1470,19 +1470,16 @@ namespace VeraCrypt File backupFile; backupFile.Open (filePath, File::OpenRead); - uint64 headerSize; bool legacyBackup; // Determine the format of the backup file switch (backupFile.Length()) { case TC_VOLUME_HEADER_GROUP_SIZE: - headerSize = TC_VOLUME_HEADER_SIZE; legacyBackup = false; break; case TC_VOLUME_HEADER_SIZE_LEGACY * 2: - headerSize = TC_VOLUME_HEADER_SIZE_LEGACY; legacyBackup = true; break; diff --git a/src/Volume/Volume.cpp b/src/Volume/Volume.cpp index ff373029..0a461154 100644 --- a/src/Volume/Volume.cpp +++ b/src/Volume/Volume.cpp @@ -119,9 +119,6 @@ namespace VeraCrypt bool skipLayoutV1Normal = false; bool deviceHosted = GetPath().IsDevice(); - size_t hostDeviceSectorSize = 0; - if (deviceHosted) - hostDeviceSectorSize = volumeFile->GetDeviceSectorSize(); // Test volume layouts foreach (shared_ptr layout, VolumeLayout::GetAvailableLayouts (volumeType)) -- cgit v1.2.3