Simplify some code found when it was moved in r277177
llvm-svn: 277394
diff --git a/llvm/lib/Object/Archive.cpp b/llvm/lib/Object/Archive.cpp
index c509124..586f9c1 100644
--- a/llvm/lib/Object/Archive.cpp
+++ b/llvm/lib/Object/Archive.cpp
@@ -166,8 +166,10 @@
StringRef::size_type End = StringRef(addr).find('\n');
return StringRef(addr, End - 1);
}
- return StringRef(addr);
- } else if (Name.startswith("#1/")) {
+ return addr;
+ }
+
+ if (Name.startswith("#1/")) {
uint64_t NameLength;
if (Name.substr(3).rtrim(' ').getAsInteger(10, NameLength)) {
std::string Buf;
@@ -191,16 +193,14 @@
}
return StringRef(reinterpret_cast<const char *>(ArMemHdr) + getSizeOf(),
NameLength).rtrim('\0');
- } else {
- // It is not a long name so trim the blanks at the end of the name.
- if (Name[Name.size() - 1] != '/') {
- return Name.rtrim(' ');
- }
}
+
+ // It is not a long name so trim the blanks at the end of the name.
+ if (Name[Name.size() - 1] != '/')
+ return Name.rtrim(' ');
+
// It's a simple name.
- if (Name[Name.size() - 1] == '/')
- return Name.substr(0, Name.size() - 1);
- return Name;
+ return Name.drop_back(1);
}
Expected<uint32_t> ArchiveMemberHeader::getSize() const {