aboutsummaryrefslogtreecommitdiff
path: root/src/resolve-system-dependencies
diff options
context:
space:
mode:
authorBen Burdette <bburdette@gmail.com>2020-06-02 08:22:24 -0600
committerBen Burdette <bburdette@gmail.com>2020-06-02 08:22:24 -0600
commitd82d230b4015c50e698e3be1ec7a3e12277a3251 (patch)
treea37b7c45eb868aa15339dae10b3f43e35899fb46 /src/resolve-system-dependencies
parent734283d636318b6dfc249afe1ddbb20bb4d02ed4 (diff)
elide the 'ErrorInfo' in logError and logWarning calls
Diffstat (limited to 'src/resolve-system-dependencies')
-rw-r--r--src/resolve-system-dependencies/resolve-system-dependencies.cc28
1 files changed, 12 insertions, 16 deletions
diff --git a/src/resolve-system-dependencies/resolve-system-dependencies.cc b/src/resolve-system-dependencies/resolve-system-dependencies.cc
index dcea72529..82feacb3d 100644
--- a/src/resolve-system-dependencies/resolve-system-dependencies.cc
+++ b/src/resolve-system-dependencies/resolve-system-dependencies.cc
@@ -39,19 +39,17 @@ std::set<std::string> runResolver(const Path & filename)
throw SysError("statting '%s'", filename);
if (!S_ISREG(st.st_mode)) {
- logError(
- ErrorInfo {
- .name = "Regular MACH file",
- .hint = hintfmt("file '%s' is not a regular file", filename)
+ logError({
+ .name = "Regular MACH file",
+ .hint = hintfmt("file '%s' is not a regular file", filename)
});
return {};
}
if (st.st_size < sizeof(mach_header_64)) {
- logError(
- ErrorInfo {
- .name = "File too short",
- .hint = hintfmt("file '%s' is too short for a MACH binary", filename)
+ logError({
+ .name = "File too short",
+ .hint = hintfmt("file '%s' is too short for a MACH binary", filename)
});
return {};
}
@@ -74,20 +72,18 @@ std::set<std::string> runResolver(const Path & filename)
}
}
if (mach64_offset == 0) {
- logError(
- ErrorInfo {
- .name = "No mach64 blobs",
- .hint = hintfmt("Could not find any mach64 blobs in file '%1%', continuing...", filename)
+ logError({
+ .name = "No mach64 blobs",
+ .hint = hintfmt("Could not find any mach64 blobs in file '%1%', continuing...", filename)
});
return {};
}
} else if (magic == MH_MAGIC_64 || magic == MH_CIGAM_64) {
mach64_offset = 0;
} else {
- logError(
- ErrorInfo {
- .name = "Magic number",
- .hint = hintfmt("Object file has unknown magic number '%1%', skipping it...", magic)
+ logError({
+ .name = "Magic number",
+ .hint = hintfmt("Object file has unknown magic number '%1%', skipping it...", magic)
});
return {};
}