[llvm] 34e2df2 - [llvm-objcopy][NFC] rename variable.
Alexey Lapshin via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 26 02:54:37 PDT 2022
Author: Alexey Lapshin
Date: 2022-04-26T12:47:23+03:00
New Revision: 34e2df21fdbc7f8164e7badbefde06e522f326f2
URL: https://github.com/llvm/llvm-project/commit/34e2df21fdbc7f8164e7badbefde06e522f326f2
DIFF: https://github.com/llvm/llvm-project/commit/34e2df21fdbc7f8164e7badbefde06e522f326f2.diff
LOG: [llvm-objcopy][NFC] rename variable.
Added:
Modified:
llvm/tools/llvm-objcopy/llvm-objcopy.cpp
Removed:
################################################################################
diff --git a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
index 2aaeea670952a..117a63cd9d8fb 100644
--- a/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
+++ b/llvm/tools/llvm-objcopy/llvm-objcopy.cpp
@@ -138,10 +138,10 @@ static Error executeObjcopyOnRawBinary(ConfigManager &ConfigMgr,
static Error executeObjcopy(ConfigManager &ConfigMgr) {
CommonConfig &Config = ConfigMgr.Common;
- Expected<FilePermissionsApplier> PermsCarrier =
+ Expected<FilePermissionsApplier> PermsApplierOrErr =
FilePermissionsApplier::create(Config.InputFilename);
- if (!PermsCarrier)
- return PermsCarrier.takeError();
+ if (!PermsApplierOrErr)
+ return PermsApplierOrErr.takeError();
std::function<Error(raw_ostream & OutFile)> ObjcopyFunc;
@@ -211,12 +211,13 @@ static Error executeObjcopy(ConfigManager &ConfigMgr) {
}
if (Error E =
- PermsCarrier->apply(Config.OutputFilename, Config.PreserveDates))
+ PermsApplierOrErr->apply(Config.OutputFilename, Config.PreserveDates))
return E;
if (!Config.SplitDWO.empty())
- if (Error E = PermsCarrier->apply(Config.SplitDWO, Config.PreserveDates,
- static_cast<sys::fs::perms>(0666)))
+ if (Error E =
+ PermsApplierOrErr->apply(Config.SplitDWO, Config.PreserveDates,
+ static_cast<sys::fs::perms>(0666)))
return E;
return Error::success();
More information about the llvm-commits
mailing list