Merge pull request #19 from jobermayr/master

Build fix for openSUSE and warning removal
This commit is contained in:
Nikolaj Schlej 2015-02-13 22:51:30 +01:00
commit 20d12b8f7c
2 changed files with 3 additions and 3 deletions

View File

@ -41,7 +41,7 @@ public:
private: private:
UINT8 findFileRecursive(const QModelIndex index, const QString & hexPattern, const UINT8 mode, QSet<QPair<QModelIndex, QModelIndex> > & files); UINT8 findFileRecursive(const QModelIndex index, const QString & hexPattern, const UINT8 mode, QSet<QPair<QModelIndex, QModelIndex> > & files);
QString UEFIFind::guidToQString(const UINT8* guid); QString guidToQString(const UINT8* guid);
FfsEngine* ffsEngine; FfsEngine* ffsEngine;
TreeModel* model; TreeModel* model;

View File

@ -776,12 +776,12 @@ UINT8 FfsEngine::parseVolume(const QByteArray & volume, QModelIndex & index, co
// Check for volume structure to be known // Check for volume structure to be known
bool volumeIsUnknown = true; bool volumeIsUnknown = true;
UINT8 volumeFfsVersion = 0; /*UINT8 volumeFfsVersion = 0;*/
// Check for FFS v2 volume // Check for FFS v2 volume
if (FFSv2Volumes.contains(QByteArray::fromRawData((const char*)volumeHeader->FileSystemGuid.Data, sizeof(EFI_GUID)))) { if (FFSv2Volumes.contains(QByteArray::fromRawData((const char*)volumeHeader->FileSystemGuid.Data, sizeof(EFI_GUID)))) {
volumeIsUnknown = false; volumeIsUnknown = false;
volumeFfsVersion = 2; /*volumeFfsVersion = 2;*/
} }
// Check for FFS v3 volume // Check for FFS v3 volume