1 files changed, 14 insertions, 12 deletions
diff --git a/third_party/nix/src/nix-store/nix-store.cc b/third_party/nix/src/nix-store/nix-store.cc
index 1f1e221fc3..2183d053e5 100644
--- a/third_party/nix/src/nix-store/nix-store.cc
+++ b/third_party/nix/src/nix-store/nix-store.cc
@@ -155,8 +155,8 @@ static void opRealise(Strings opFlags, Strings opArgs) {
         store->followLinksToStorePath(p.first), p.second));
   }
 
-  unsigned long long downloadSize;
-  unsigned long long narSize;
+  unsigned long long downloadSize = 0;
+  unsigned long long narSize = 0;
   PathSet willBuild;
   PathSet willSubstitute;
   PathSet unknown;
@@ -959,9 +959,9 @@ static void opServe(Strings opFlags, Strings opArgs) {
   };
 
   while (true) {
-    ServeCommand cmd;
+    ServeCommand cmd{};
     try {
-      cmd = (ServeCommand)readInt(in);
+      cmd = static_cast<ServeCommand>(readInt(in));
     } catch (EndOfFile& e) {
       break;
     }
@@ -988,8 +988,8 @@ static void opServe(Strings opFlags, Strings opArgs) {
               paths2.insert(path);
             }
           }
-          unsigned long long downloadSize;
-          unsigned long long narSize;
+          unsigned long long downloadSize = 0;
+          unsigned long long narSize = 0;
           PathSet willBuild;
           PathSet willSubstitute;
           PathSet unknown;
@@ -1170,13 +1170,15 @@ static void opGenerateBinaryCacheKey(Strings opFlags, Strings opArgs) {
     throw Error("key generation failed");
   }
 
-  writeFile(publicKeyFile, keyName + ":" +
-                               absl::Base64Escape(std::string(
-                                   (char*)pk, crypto_sign_PUBLICKEYBYTES)));
+  writeFile(publicKeyFile,
+            keyName + ":" +
+                absl::Base64Escape(std::string(reinterpret_cast<char*>(pk),
+                                               crypto_sign_PUBLICKEYBYTES)));
   umask(0077);
-  writeFile(secretKeyFile, keyName + ":" +
-                               absl::Base64Escape(std::string(
-                                   (char*)sk, crypto_sign_SECRETKEYBYTES)));
+  writeFile(secretKeyFile,
+            keyName + ":" +
+                absl::Base64Escape(std::string(reinterpret_cast<char*>(sk),
+                                               crypto_sign_SECRETKEYBYTES)));
 #else
   throw Error(
       "Nix was not compiled with libsodium, required for signed binary cache "