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