[PATCH v4 3/4] Change GIT_ALLOC_LIMIT check to use ssize_t for consistency
- From
Steffen Prohaska <prohaska@zib.de>
- Date
- Aug 22, 2014, 14:01 UTC
- Message-ID
- <1408716083-9093-4-git-send-email-prohaska@zib.de>
- In-Reply-To
- <1408716083-9093-1-git-send-email-prohaska@zib.de>
GIT_ALLOC_LIMIT limits xmalloc()'s size, which is of type size_t. Use ssize_t to store the limit for consistency. The change has no direct practical impact, because we use GIT_ALLOC_LIMIT to test small sizes.
The cast of size in the call to die() is changed to uintmax_t to match the format string PRIuMAX.
Signed-off-by: Steffen Prohaska <prohaska@zib.de> --- wrapper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/wrapper.c b/wrapper.c index bc1bfb8..e91f6e9 100644 --- a/wrapper.c +++ b/wrapper.c @@ -11,14 +11,14 @@ static void (*try_to_free_routine)(size_t size) = do_nothing; static void memory_limit_check(size_t size) { - static int limit = -1; + static ssize_t limit = -1; if (limit == -1) { const char *env = getenv("GIT_ALLOC_LIMIT"); - limit = env ? atoi(env) * 1024 : 0; + limit = env ? atol(env) * 1024 : 0; } if (limit && size > limit) - die("attempting to allocate %"PRIuMAX" over limit %d", - (intmax_t)size, limit); + die("attempting to allocate %"PRIuMAX" over limit %"PRIuMAX, + (uintmax_t)size, (uintmax_t)limit); } try_to_free_t set_try_to_free_routine(try_to_free_t routine)
-- 2.1.0.6.gb452461