diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-09 05:26:25 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-07-09 05:26:25 +0000 |
commit | be6b9101d412711b69f6cfc1068efdf0ba7eb586 (patch) | |
tree | a503230c20c9fcdd86f4f73bad9afd580ced7ae0 /lib/Object | |
parent | 3d84b07f9581408d8ee9262744afd8ab02ff1821 (diff) | |
download | llvm-be6b9101d412711b69f6cfc1068efdf0ba7eb586.tar.gz llvm-be6b9101d412711b69f6cfc1068efdf0ba7eb586.tar.bz2 llvm-be6b9101d412711b69f6cfc1068efdf0ba7eb586.tar.xz |
Compute the size of an archive member in the constructor.
It is always computed the same way (by parsing the header). Doing it in the
constructor simplifies the callers a bit.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185905 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Object')
-rw-r--r-- | lib/Object/Archive.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp index 5585bc44f7..c8a9692423 100644 --- a/lib/Object/Archive.cpp +++ b/lib/Object/Archive.cpp @@ -61,13 +61,18 @@ uint64_t ArchiveMemberHeader::getSize() const { return ret; } -Archive::Child::Child(const Archive *p, StringRef d) : Parent(p), Data(d) { - if (!p || d.empty()) +Archive::Child::Child(const Archive *Parent, const char *Start) + : Parent(Parent) { + if (!Start) return; + + const ArchiveMemberHeader *Header = ToHeader(Start); + Data = StringRef(Start, sizeof(ArchiveMemberHeader) + Header->getSize()); + // Setup StartOfFile and PaddingBytes. StartOfFile = sizeof(ArchiveMemberHeader); // Don't include attached name. - StringRef Name = ToHeader(Data.data())->getName(); + StringRef Name = Header->getName(); if (Name.startswith("#1/")) { uint64_t NameSize; if (Name.substr(3).rtrim(" ").getAsInteger(10, NameSize)) @@ -86,11 +91,9 @@ Archive::Child Archive::Child::getNext() const { // Check to see if this is past the end of the archive. if (NextLoc >= Parent->Data->getBufferEnd()) - return Child(Parent, StringRef(0, 0)); - - size_t NextSize = sizeof(ArchiveMemberHeader) + ToHeader(NextLoc)->getSize(); + return Child(Parent, NULL); - return Child(Parent, StringRef(NextLoc, NextSize)); + return Child(Parent, NextLoc); } error_code Archive::Child::getName(StringRef &Result) const { @@ -265,9 +268,7 @@ Archive::Archive(MemoryBuffer *source, error_code &ec) Archive::child_iterator Archive::begin_children(bool skip_internal) const { const char *Loc = Data->getBufferStart() + strlen(Magic); - size_t Size = sizeof(ArchiveMemberHeader) + - ToHeader(Loc)->getSize(); - Child c(this, StringRef(Loc, Size)); + Child c(this, Loc); // Skip internals at the beginning of an archive. if (skip_internal && isInternalMember(*ToHeader(Loc))) return c.getNext(); @@ -275,7 +276,7 @@ Archive::child_iterator Archive::begin_children(bool skip_internal) const { } Archive::child_iterator Archive::end_children() const { - return Child(this, StringRef(0, 0)); + return Child(this, NULL); } error_code Archive::Symbol::getName(StringRef &Result) const { @@ -323,9 +324,7 @@ error_code Archive::Symbol::getMember(child_iterator &Result) const { } const char *Loc = Parent->getData().begin() + Offset; - size_t Size = sizeof(ArchiveMemberHeader) + - ToHeader(Loc)->getSize(); - Result = Child(Parent, StringRef(Loc, Size)); + Result = Child(Parent, Loc); return object_error::success; } |