diff options
| author | Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au> | 2013-05-05 12:53:36 +0200 |
|---|---|---|
| committer | Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au> | 2013-05-05 12:53:36 +0200 |
| commit | 55d6c9551e13b108947410d7bf50b6ba2c01b633 (patch) | |
| tree | 992992cd5f8de4461829efd0c000c4b09c595412 /libpit/Source | |
| parent | Changed Arguments.h constructors with default parameters so it compiles with clang. (diff) | |
| download | Heimdall-55d6c9551e13b108947410d7bf50b6ba2c01b633.tar Heimdall-55d6c9551e13b108947410d7bf50b6ba2c01b633.tar.gz Heimdall-55d6c9551e13b108947410d7bf50b6ba2c01b633.tar.bz2 Heimdall-55d6c9551e13b108947410d7bf50b6ba2c01b633.tar.lz Heimdall-55d6c9551e13b108947410d7bf50b6ba2c01b633.tar.xz Heimdall-55d6c9551e13b108947410d7bf50b6ba2c01b633.tar.zst Heimdall-55d6c9551e13b108947410d7bf50b6ba2c01b633.zip | |
Diffstat (limited to 'libpit/Source')
| -rw-r--r-- | libpit/Source/libpit.cpp | 10 | ||||
| -rw-r--r-- | libpit/Source/libpit.h | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libpit/Source/libpit.cpp b/libpit/Source/libpit.cpp index a1138b5..1f29816 100644 --- a/libpit/Source/libpit.cpp +++ b/libpit/Source/libpit.cpp @@ -193,7 +193,7 @@ void PitData::Pack(unsigned char *data) const PitData::PackInteger(data, entryOffset + 32, entries[i]->GetFileSize()); memcpy(data + entryOffset + 36, entries[i]->GetPartitionName(), PitEntry::kPartitionNameMaxLength); - memcpy(data + entryOffset + 36 + PitEntry::kPartitionNameMaxLength, entries[i]->GetPartitionName(), PitEntry::kFlashFilenameMaxLength); + memcpy(data + entryOffset + 36 + PitEntry::kPartitionNameMaxLength, entries[i]->GetFlashFilename(), PitEntry::kFlashFilenameMaxLength); memcpy(data + entryOffset + 36 + PitEntry::kPartitionNameMaxLength + PitEntry::kFlashFilenameMaxLength, entries[i]->GetFotaFilename(), PitEntry::kFotaFilenameMaxLength); } @@ -255,7 +255,7 @@ PitEntry *PitData::FindEntry(const char *partitionName) { for (unsigned int i = 0; i < entries.size(); i++) { - if (entries[i]->GetBlockCount() > 0 && strcmp(entries[i]->GetPartitionName(), partitionName) == 0) + if (entries[i]->IsFlashable() && strcmp(entries[i]->GetPartitionName(), partitionName) == 0) return (entries[i]); } @@ -266,7 +266,7 @@ const PitEntry *PitData::FindEntry(const char *partitionName) const { for (unsigned int i = 0; i < entries.size(); i++) { - if (entries[i]->GetBlockCount() > 0 && strcmp(entries[i]->GetPartitionName(), partitionName) == 0) + if (entries[i]->IsFlashable() && strcmp(entries[i]->GetPartitionName(), partitionName) == 0) return (entries[i]); } @@ -277,7 +277,7 @@ PitEntry *PitData::FindEntry(unsigned int partitionIdentifier) { for (unsigned int i = 0; i < entries.size(); i++) { - if (entries[i]->GetBlockCount() > 0 && entries[i]->GetIdentifier() == partitionIdentifier) + if (entries[i]->IsFlashable() && entries[i]->GetIdentifier() == partitionIdentifier) return (entries[i]); } @@ -288,7 +288,7 @@ const PitEntry *PitData::FindEntry(unsigned int partitionIdentifier) const { for (unsigned int i = 0; i < entries.size(); i++) { - if (entries[i]->GetBlockCount() > 0 && entries[i]->GetIdentifier() == partitionIdentifier) + if (entries[i]->IsFlashable() && entries[i]->GetIdentifier() == partitionIdentifier) return (entries[i]); } diff --git a/libpit/Source/libpit.h b/libpit/Source/libpit.h index eb37647..c2bc691 100644 --- a/libpit/Source/libpit.h +++ b/libpit/Source/libpit.h @@ -103,6 +103,11 @@ namespace libpit bool Matches(const PitEntry *otherPitEntry) const; + bool IsFlashable(void) const + { + return strlen(partitionName) != 0; + } + unsigned int GetBinaryType(void) const { return binaryType; |