aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dobell <benjamin.dobell+github@glassechidna.com.au>2016-03-07 01:47:06 +1100
committerBenjamin Dobell <benjamin.dobell+github@glassechidna.com.au>2016-03-07 01:47:06 +1100
commit86b7be8329fc5e14e016968b6b1bf22a6ef821d1 (patch)
treeb4744005c1b59b7cff03f8a117e5beec4360ac51
parent2bab8d9473cc237f6665a9cfe784942e0a2038e8 (diff)
parent05d4c747a97124dbf92af9f718fefe475074ce41 (diff)
downloadexternal_heimdall-86b7be8329fc5e14e016968b6b1bf22a6ef821d1.zip
external_heimdall-86b7be8329fc5e14e016968b6b1bf22a6ef821d1.tar.gz
external_heimdall-86b7be8329fc5e14e016968b6b1bf22a6ef821d1.tar.bz2
Merge pull request #332 from kratz00/unused_variables
- fixed compiler warning: dead initialization (the values are never read)
-rw-r--r--heimdall/source/PrintPitAction.cpp2
-rw-r--r--heimdall/source/SendFilePartPacket.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/heimdall/source/PrintPitAction.cpp b/heimdall/source/PrintPitAction.cpp
index 12c28d1..7ae8e6b 100644
--- a/heimdall/source/PrintPitAction.cpp
+++ b/heimdall/source/PrintPitAction.cpp
@@ -139,7 +139,7 @@ int PrintPitAction::Execute(int argc, char **argv)
// Load the local pit file into memory.
unsigned char *pitFileBuffer = new unsigned char[localPitFileSize];
- size_t dataRead = fread(pitFileBuffer, 1, localPitFileSize, localPitFile); // dataRead is discarded, it's here to remove warnings.
+ (void)fread(pitFileBuffer, 1, localPitFileSize, localPitFile);
FileClose(localPitFile);
PitData *pitData = new PitData();
diff --git a/heimdall/source/SendFilePartPacket.h b/heimdall/source/SendFilePartPacket.h
index 38e9dbe..561bf58 100644
--- a/heimdall/source/SendFilePartPacket.h
+++ b/heimdall/source/SendFilePartPacket.h
@@ -46,9 +46,7 @@ namespace Heimdall
// min(fileSize, size)
unsigned int bytesToRead = (fileSize < size) ? fileSize - position : size;
-
- // bytesRead is discarded (it's just there to stop GCC warnings)
- unsigned int bytesRead = fread(data, 1, bytesToRead, file);
+ (void)fread(data, 1, bytesToRead, file);
}
SendFilePartPacket(unsigned char *buffer, unsigned int size) : OutboundPacket(size)