summaryrefslogtreecommitdiffstats
path: root/heimdall/source
diff options
context:
space:
mode:
authorBenjamin Dobell <benjamin.dobell+github@glassechidna.com.au>2011-06-01 08:41:50 +0200
committerBenjamin Dobell <benjamin.dobell+github@glassechidna.com.au>2011-06-01 08:41:50 +0200
commit1e2894839a1458c983b7387d4b2b8a453b726c9c (patch)
treec59e00a2c8a65def0e892764e28da6ae3d0eb18a /heimdall/source
parentLinux Makefile.am fixes. (diff)
downloadHeimdall-1e2894839a1458c983b7387d4b2b8a453b726c9c.tar
Heimdall-1e2894839a1458c983b7387d4b2b8a453b726c9c.tar.gz
Heimdall-1e2894839a1458c983b7387d4b2b8a453b726c9c.tar.bz2
Heimdall-1e2894839a1458c983b7387d4b2b8a453b726c9c.tar.lz
Heimdall-1e2894839a1458c983b7387d4b2b8a453b726c9c.tar.xz
Heimdall-1e2894839a1458c983b7387d4b2b8a453b726c9c.tar.zst
Heimdall-1e2894839a1458c983b7387d4b2b8a453b726c9c.zip
Diffstat (limited to 'heimdall/source')
-rw-r--r--heimdall/source/InterfaceManager.cpp4
-rw-r--r--heimdall/source/SendFilePartPacket.h4
-rw-r--r--heimdall/source/main.cpp5
3 files changed, 9 insertions, 4 deletions
diff --git a/heimdall/source/InterfaceManager.cpp b/heimdall/source/InterfaceManager.cpp
index aaf6d0b..3467e8b 100644
--- a/heimdall/source/InterfaceManager.cpp
+++ b/heimdall/source/InterfaceManager.cpp
@@ -20,6 +20,7 @@
// C/C++ Standard Library
#include <cstdarg>
+#include <cstdlib>
#include <stdio.h>
// Heimdall
@@ -94,7 +95,8 @@ int InterfaceManager::actionValuelessArgumentCounts[kActionCount + 1] = {
kFlashArgPit, 0, kDumpArgChipType, 0, 0, kCommonArgDelay
};
-const char *InterfaceManager::usage = "Usage: heimdall <action> <arguments> [--verbose] [--no-reboot] [--delay <ms>]\n\
+const char *InterfaceManager::usage = "\nHeimdall v1.0.2b, Copyright (c) 2010-2011, Benjamin Dobell, Glass Echidna\n\n\
+Usage: heimdall <action> <arguments> [--verbose] [--no-reboot] [--delay <ms>]\n\
\n\
action: flash\n\
arguments:\n\
diff --git a/heimdall/source/SendFilePartPacket.h b/heimdall/source/SendFilePartPacket.h
index 0b41830..7734e2a 100644
--- a/heimdall/source/SendFilePartPacket.h
+++ b/heimdall/source/SendFilePartPacket.h
@@ -51,7 +51,9 @@ namespace Heimdall
// min(fileSize, size)
int bytesToRead = (fileSize < size) ? fileSize - position : size;
- fread(data, 1, bytesToRead, file);
+
+ // bytesRead is discarded (it's just there to stop GCC warnings)
+ int bytesRead = fread(data, 1, bytesToRead, file);
}
void Pack(void)
diff --git a/heimdall/source/main.cpp b/heimdall/source/main.cpp
index 81e1ea7..cb372ea 100644
--- a/heimdall/source/main.cpp
+++ b/heimdall/source/main.cpp
@@ -439,7 +439,8 @@ bool attemptFlash(BridgeManager *bridgeManager, map<string, FILE *> argumentFile
long localPitFileSize = ftell(localPitFile);
rewind(localPitFile);
- fread(pitFileBuffer, 1, localPitFileSize, localPitFile);
+ // dataRead is discarded, it's here to remove warnings.
+ int dataRead = fread(pitFileBuffer, 1, localPitFileSize, localPitFile);
rewind(localPitFile);
pitData = new PitData();
@@ -566,7 +567,7 @@ int main(int argc, char **argv)
}
}
- InterfaceManager::Print("\nHeimdall v, Copyright (c) 2010, Benjamin Dobell, Glass Echidna\n");
+ InterfaceManager::Print("\nHeimdall v1.0.2b, Copyright (c) 2010-2011, Benjamin Dobell, Glass Echidna\n");
InterfaceManager::Print("http://www.glassechidna.com.au\n\n");
InterfaceManager::Print("This software is provided free of charge. Copying and redistribution is\nencouraged.\n\n");
InterfaceManager::Print("If you appreciate this software and you would like to support future\ndevelopment please consider donating:\n");