OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/disk_cache: fix size subtraction on 32bit

Browse Source 
Negating size_t on 32bit produces a 32bit result. This was effectively
adding values close to UINT_MAX to the cache size (the files are usually
small) instead of intended subtraction.
Fixes 'make check' disk_cache failures on 32bit.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Grazvydas Ignotas
2017-03-09 02:54:53 +02:00
committed by Timothy Arceri
parent 926bcacfd3
commit 61bbb25a08
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/disk_cache.c
View File

@@ -603,7 +603,7 @@ evict_random_item(struct disk_cache *cache)
free(dir_path); free(dir_path);
if (size) { if (size) {
p_atomic_add(cache->size, - size); p_atomic_add(cache->size, - (uint64_t)size);
return; return;
} }
@@ -624,7 +624,7 @@ evict_random_item(struct disk_cache *cache)
free(dir_path); free(dir_path);
if (size) if (size)
p_atomic_add(cache->size, - size); p_atomic_add(cache->size, - (uint64_t)size);
} }
void void
@@ -646,7 +646,7 @@ disk_cache_remove(struct disk_cache *cache, const cache_key key)
free(filename); free(filename);
if (sb.st_size) if (sb.st_size)
p_atomic_add(cache->size, - sb.st_size); p_atomic_add(cache->size, - (uint64_t)sb.st_size);
} }
/* From the zlib docs: /* From the zlib docs: