From d331d3a0b5c497a46e2636f308234be66566c04c Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 20 May 2020 04:33:07 +0100 Subject: refactor(3p/nix): Apply clang-tidy's modernize-* fixes This applies the modernization fixes listed here: https://clang.llvm.org/extra/clang-tidy/checks/list.html The 'modernize-use-trailing-return-type' fix was excluded due to my personal preference (more specifically, I think the 'auto' keyword is misleading in that position). --- third_party/nix/src/libstore/references.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'third_party/nix/src/libstore/references.cc') diff --git a/third_party/nix/src/libstore/references.cc b/third_party/nix/src/libstore/references.cc index 64b997ce3e68..c8cebaec08f3 100644 --- a/third_party/nix/src/libstore/references.cc +++ b/third_party/nix/src/libstore/references.cc @@ -18,11 +18,11 @@ static void search(const unsigned char* s, size_t len, StringSet& hashes, static bool initialised = false; static bool isBase32[256]; if (!initialised) { - for (unsigned int i = 0; i < 256; ++i) { - isBase32[i] = false; + for (bool& i : isBase32) { + i = false; } - for (unsigned int i = 0; i < base32Chars.size(); ++i) { - isBase32[(unsigned char)base32Chars[i]] = true; + for (char base32Char : base32Chars) { + isBase32[(unsigned char)base32Char] = true; } initialised = true; } @@ -59,7 +59,7 @@ struct RefScanSink : Sink { RefScanSink() : hashSink(htSHA256) {} - void operator()(const unsigned char* data, size_t len); + void operator()(const unsigned char* data, size_t len) override; }; void RefScanSink::operator()(const unsigned char* data, size_t len) { -- cgit 1.4.1