From 3f226f71c185b2fbaaabb01bd0f3ba3cd4a39612 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Sep 2020 14:40:41 +0000
Subject: [PATCH] Return more info from `BinaryCacheStore::addToStoreCommon`

We don't need it yet, but we could/should in the future, and it's a
cost-free change since we already have the reference. I like it.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
---
 src/libstore/binary-cache-store.cc | 8 ++++----
 src/libstore/binary-cache-store.hh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc
index 817661869..f7a52a296 100644
--- a/src/libstore/binary-cache-store.cc
+++ b/src/libstore/binary-cache-store.cc
@@ -142,7 +142,7 @@ struct FileSource : FdSource
     }
 };
 
-StorePath BinaryCacheStore::addToStoreCommon(
+ref<const ValidPathInfo> BinaryCacheStore::addToStoreCommon(
     Source & narSource, RepairFlag repair, CheckSigsFlag checkSigs,
     std::function<ValidPathInfo(HashResult)> mkInfo)
 {
@@ -297,7 +297,7 @@ StorePath BinaryCacheStore::addToStoreCommon(
 
     stats.narInfoWrite++;
 
-    return narInfo->path;
+    return narInfo;
 }
 
 void BinaryCacheStore::addToStore(const ValidPathInfo & info, Source & narSource,
@@ -330,7 +330,7 @@ StorePath BinaryCacheStore::addToStoreFromDump(Source & dump, const string & nam
         };
         info.narSize = nar.second;
         return info;
-    });
+    })->path;
 }
 
 bool BinaryCacheStore::isValidPathUncached(const StorePath & storePath)
@@ -430,7 +430,7 @@ StorePath BinaryCacheStore::addTextToStore(const string & name, const string & s
         info.narSize = nar.second;
         info.references = references;
         return info;
-    });
+    })->path;
 }
 
 ref<FSAccessor> BinaryCacheStore::getFSAccessor()
diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh
index ce69ad3b4..5224d7ec8 100644
--- a/src/libstore/binary-cache-store.hh
+++ b/src/libstore/binary-cache-store.hh
@@ -72,7 +72,7 @@ private:
 
     void writeNarInfo(ref<NarInfo> narInfo);
 
-    StorePath addToStoreCommon(
+    ref<const ValidPathInfo> addToStoreCommon(
         Source & narSource, RepairFlag repair, CheckSigsFlag checkSigs,
         std::function<ValidPathInfo(HashResult)> mkInfo);