From d82d230b4015c50e698e3be1ec7a3e12277a3251 Mon Sep 17 00:00:00 2001
From: Ben Burdette <bburdette@gmail.com>
Date: Tue, 2 Jun 2020 08:22:24 -0600
Subject: elide the 'ErrorInfo' in logError and logWarning calls

---
 src/nix/verify.cc | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'src/nix/verify.cc')

diff --git a/src/nix/verify.cc b/src/nix/verify.cc
index 8c845bfc2..8ecd9a8f3 100644
--- a/src/nix/verify.cc
+++ b/src/nix/verify.cc
@@ -99,15 +99,14 @@ struct CmdVerify : StorePathsCommand
                     if (hash.first != info->narHash) {
                         corrupted++;
                         act2.result(resCorruptedPath, store->printStorePath(info->path));
-                        logError(
-                            ErrorInfo { 
-                                .name = "Hash error - path modified",
-                                .hint = hintfmt(
-                                    "path '%s' was modified! expected hash '%s', got '%s'",
-                                    store->printStorePath(info->path),
-                                    info->narHash.to_string(),
-                                    hash.first.to_string())
-                            });
+                        logError({ 
+                            .name = "Hash error - path modified",
+                            .hint = hintfmt(
+                                "path '%s' was modified! expected hash '%s', got '%s'",
+                                store->printStorePath(info->path),
+                                info->narHash.to_string(),
+                                hash.first.to_string())
+                        });
                     }
 
                 }
@@ -156,11 +155,10 @@ struct CmdVerify : StorePathsCommand
                     if (!good) {
                         untrusted++;
                         act2.result(resUntrustedPath, store->printStorePath(info->path));
-                        logError(
-                            ErrorInfo { 
-                                .name = "Untrusted path",
-                                .hint = hintfmt("path '%s' is untrusted",
-                                    store->printStorePath(info->path))
+                        logError({ 
+                            .name = "Untrusted path",
+                            .hint = hintfmt("path '%s' is untrusted",
+                                store->printStorePath(info->path))
                         });
 
                     }
-- 
cgit v1.2.3