diff options
| author | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
|---|---|---|
| committer | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
| commit | 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch) | |
| tree | 7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /libraries/pack200/src/utils.h | |
| parent | 5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff) | |
| download | MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip | |
merged from 0.6.7 codebase
Diffstat (limited to 'libraries/pack200/src/utils.h')
| -rw-r--r-- | libraries/pack200/src/utils.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libraries/pack200/src/utils.h b/libraries/pack200/src/utils.h index 5a3dc8f6..3bd2dae7 100644 --- a/libraries/pack200/src/utils.h +++ b/libraries/pack200/src/utils.h @@ -35,17 +35,17 @@ void *must_malloc(size_t size); inline size_t scale_size(size_t size, size_t scale) { - return (size > PSIZE_MAX / scale) ? OVERFLOW : size * scale; + return (size > PSIZE_MAX / scale) ? OVERFLOW : size * scale; } inline size_t add_size(size_t size1, size_t size2) { - return ((size1 | size2 | (size1 + size2)) > PSIZE_MAX) ? OVERFLOW : size1 + size2; + return ((size1 | size2 | (size1 + size2)) > PSIZE_MAX) ? OVERFLOW : size1 + size2; } inline size_t add_size(size_t size1, size_t size2, int size3) { - return add_size(add_size(size1, size2), size3); + return add_size(add_size(size1, size2), size3); } struct unpacker; |