From 8be28cdc5281edbe83886168978303345ca4a78b Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Thu, 2 May 2019 10:32:03 +0000 Subject: [Object] Change getSectionName() to return Expected Summary: It currently receives an output parameter and returns std::error_code. Expected fits for this purpose perfectly. Differential Revision: https://reviews.llvm.org/D61421 llvm-svn: 359774 --- llvm/lib/Object/XCOFFObjectFile.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'llvm/lib/Object/XCOFFObjectFile.cpp') diff --git a/llvm/lib/Object/XCOFFObjectFile.cpp b/llvm/lib/Object/XCOFFObjectFile.cpp index e74085575a6..bc982593f0b 100644 --- a/llvm/lib/Object/XCOFFObjectFile.cpp +++ b/llvm/lib/Object/XCOFFObjectFile.cpp @@ -119,14 +119,12 @@ void XCOFFObjectFile::moveSectionNext(DataRefImpl &Sec) const { Sec.p = reinterpret_cast(Ptr + getSectionHeaderSize()); } -std::error_code XCOFFObjectFile::getSectionName(DataRefImpl Sec, - StringRef &Res) const { +Expected XCOFFObjectFile::getSectionName(DataRefImpl Sec) const { const char *Name = toSection(Sec)->Name; auto NulCharPtr = static_cast(memchr(Name, '\0', XCOFF::SectionNameSize)); - Res = NulCharPtr ? StringRef(Name, NulCharPtr - Name) - : StringRef(Name, XCOFF::SectionNameSize); - return std::error_code(); + return NulCharPtr ? StringRef(Name, NulCharPtr - Name) + : StringRef(Name, XCOFF::SectionNameSize); } uint64_t XCOFFObjectFile::getSectionAddress(DataRefImpl Sec) const { -- cgit v1.2.3