From b2247ef4f6b02cf4e666455eb9afc86398fff35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@tweag.io>
Date: Thu, 15 Jun 2023 21:24:14 +0200
Subject: [PATCH] Don't assume the type of string::size_type

The code accidentally conflated `std::string::size_type` and `long unsigned int`.
This was fine on 64bits machines where they are apparently the same in
practice, but not on 32bits. Fix that by using `std::string::size_type`
everywhere.
---
 src/libutil/references.cc | 2 +-
 src/libutil/references.hh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libutil/references.cc b/src/libutil/references.cc
index 74003584a..7f59b4c09 100644
--- a/src/libutil/references.cc
+++ b/src/libutil/references.cc
@@ -75,7 +75,7 @@ RewritingSink::RewritingSink(const std::string & from, const std::string & to, S
 RewritingSink::RewritingSink(const StringMap & rewrites, Sink & nextSink)
     : rewrites(rewrites), nextSink(nextSink)
 {
-    long unsigned int maxRewriteSize = 0;
+    std::string::size_type maxRewriteSize = 0;
     for (auto & [from, to] : rewrites) {
         assert(from.size() == to.size());
         maxRewriteSize = std::max(maxRewriteSize, from.size());
diff --git a/src/libutil/references.hh b/src/libutil/references.hh
index ffd730e7b..f0baeffe1 100644
--- a/src/libutil/references.hh
+++ b/src/libutil/references.hh
@@ -26,7 +26,7 @@ public:
 struct RewritingSink : Sink
 {
     const StringMap rewrites;
-    long unsigned int maxRewriteSize;
+    std::string::size_type maxRewriteSize;
     std::string prev;
     Sink & nextSink;
     uint64_t pos = 0;