From 49750f15ed2db55247cc03170fec1eed617d9454 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 11 Jul 2018 16:32:10 -0700 Subject: applypatch: Fix the return type of FreeSpaceForFile(). Prior to this CL, FreeSpaceForFile() was returning `size_t`, which may overflow on ILP32 when called on a partition with 4GiB+ free space. Additionally, it was returning static_cast(-1) on error, but the caller in freecache.cpp didn't check for that. This CL changes its return type to `int64_t`, and moves the function into freecache.cpp since there's no external caller. Test: Run recovery_unit_test on marlin. Test: Code search shows no external user of FreeSpaceForFile(). Change-Id: I00f501a057726e1f1ab69f367c46c77b30f2d774 --- applypatch/include/applypatch/applypatch.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'applypatch/include') diff --git a/applypatch/include/applypatch/applypatch.h b/applypatch/include/applypatch/applypatch.h index 92db59c3a..88659b86a 100644 --- a/applypatch/include/applypatch/applypatch.h +++ b/applypatch/include/applypatch/applypatch.h @@ -40,10 +40,6 @@ using SinkFn = std::function; int ShowLicenses(); -// Returns the amount of free space (in bytes) on the filesystem containing filename, or -1 on -// error. filename must exist. -size_t FreeSpaceForFile(const std::string& filename); - // Checks whether /cache partition has at least 'bytes'-byte free space. Returns 0 on having // sufficient space. int CacheSizeCheck(size_t bytes); @@ -119,8 +115,8 @@ int ApplyImagePatch(const unsigned char* old_data, size_t old_size, const Value& int MakeFreeSpaceOnCache(size_t bytes_needed); -// Removes the files in |dirname| until we have at least |bytes_needed| bytes of free space on -// the partition. The size of the free space is returned by calling |space_checker|. +// Removes the files in |dirname| until we have at least |bytes_needed| bytes of free space on the +// partition. |space_checker| should return the size of the free space, or -1 on error. bool RemoveFilesInDirectory(size_t bytes_needed, const std::string& dirname, - const std::function& space_checker); + const std::function& space_checker); #endif -- cgit v1.2.3