From 1e2894839a1458c983b7387d4b2b8a453b726c9c Mon Sep 17 00:00:00 2001 From: Benjamin Dobell Date: Wed, 1 Jun 2011 16:41:50 +1000 Subject: More linux-specific fixes/changes. --- heimdall/source/InterfaceManager.cpp | 4 +++- heimdall/source/SendFilePartPacket.h | 4 +++- heimdall/source/main.cpp | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'heimdall/source') 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 +#include #include // Heimdall @@ -94,7 +95,8 @@ int InterfaceManager::actionValuelessArgumentCounts[kActionCount + 1] = { kFlashArgPit, 0, kDumpArgChipType, 0, 0, kCommonArgDelay }; -const char *InterfaceManager::usage = "Usage: heimdall [--verbose] [--no-reboot] [--delay ]\n\ +const char *InterfaceManager::usage = "\nHeimdall v1.0.2b, Copyright (c) 2010-2011, Benjamin Dobell, Glass Echidna\n\n\ +Usage: heimdall [--verbose] [--no-reboot] [--delay ]\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 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"); -- cgit v1.2.3