diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-03-28 23:22:10 +0000 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2020-03-29 11:23:15 -0400 |
| commit | 87b32bab05ff91981c8847d66cd5502feb44f3b5 (patch) | |
| tree | ff77f6703185a8b9544f354de5853254ef88a4d8 /src/nix/verify.cc | |
| parent | eb1911e277bfcc1b161cb996205ae1696f496099 (diff) | |
Use `enum struct` and drop prefixes
This does a few enums; the rest will be gotten in subsequent commits.
Diffstat (limited to 'src/nix/verify.cc')
| -rw-r--r-- | src/nix/verify.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nix/verify.cc b/src/nix/verify.cc index 9b0658803..17d4410cf 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -57,7 +57,7 @@ struct CmdVerify : StorePathsCommand auto publicKeys = getDefaultPublicKeys(); - Activity act(*logger, actVerifyPaths); + Activity act(*logger, ActivityType::VerifyPaths); std::atomic<size_t> done{0}; std::atomic<size_t> untrusted{0}; @@ -75,7 +75,7 @@ struct CmdVerify : StorePathsCommand try { checkInterrupt(); - Activity act2(*logger, lvlInfo, actUnknown, fmt("checking '%s'", storePath)); + Activity act2(*logger, Verbosity::Info, ActivityType::Unknown, fmt("checking '%s'", storePath)); MaintainCount<std::atomic<size_t>> mcActive(active); update(); @@ -96,7 +96,7 @@ struct CmdVerify : StorePathsCommand if (hash.first != info->narHash) { corrupted++; - act2.result(resCorruptedPath, store->printStorePath(info->path)); + act2.result(ResultType::CorruptedPath, store->printStorePath(info->path)); printError( "path '%s' was modified! expected hash '%s', got '%s'", store->printStorePath(info->path), info->narHash.to_string(), hash.first.to_string()); @@ -147,7 +147,7 @@ struct CmdVerify : StorePathsCommand if (!good) { untrusted++; - act2.result(resUntrustedPath, store->printStorePath(info->path)); + act2.result(ResultType::UntrustedPath, store->printStorePath(info->path)); printError("path '%s' is untrusted", store->printStorePath(info->path)); } |