Mesa (staging/21.2): util/fossilize_db: Use uint64_t for file size.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 7b2a1152251c78619b81fd424d43989e96ec079f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b2a1152251c78619b81fd424d43989e96ec079f

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Sat Aug  7 23:20:13 2021 +0200

util/fossilize_db: Use uint64_t for file size.

For those 32-bit systems with 4G of cache.

Fixes: 2ec1bff0f3a "util/fossilize_db: Split out reading the index."
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12266>
(cherry picked from commit 1c4dce1aa75c8732c5d1135d943bcc36b162eb4b)

---

 .pick_status.json       | 2 +-
 src/util/fossilize_db.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 719d8a45fa5..add6a910a11 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -580,7 +580,7 @@
         "description": "util/fossilize_db: Use uint64_t for file size.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2ec1bff0f3a4450a9739d59421dc9c9fe72c94c6"
     },
diff --git a/src/util/fossilize_db.c b/src/util/fossilize_db.c
index 5295d5c5561..d3c039e90d3 100644
--- a/src/util/fossilize_db.c
+++ b/src/util/fossilize_db.c
@@ -112,7 +112,7 @@ update_foz_index(struct foz_db *foz_db, FILE *db_idx, unsigned file_idx)
 {
    uint64_t offset = ftell(db_idx);
    fseek(db_idx, 0, SEEK_END);
-   size_t len = ftell(db_idx);
+   uint64_t len = ftell(db_idx);
    uint64_t parsed_offset = offset;
 
    if (offset == len)