From: R. Tyler Ballance Date: Sun, 21 Dec 2008 21:37:34 GMT Subject: [PATCH] Style changes per suggestions from Junio in #git Message-ID: <1229895454-19498-3-git-send-email-tyler@slide.com> In-Reply-To: <1229895454-19498-2-git-send-email-tyler@slide.com> Moving includes into git-compat-util.h, move away from malloc(2) Signed-off-by: R. Tyler Ballance --- environment.c | 9 +++------ git-compat-util.h | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/environment.c b/environment.c index a3b6bab..aa36360 100644 --- a/environment.c +++ b/environment.c @@ -7,8 +7,6 @@ * even if you might want to know where the git directory etc * are. */ -#include -#include #include "cache.h" @@ -80,10 +78,9 @@ static void setup_git_env(void) git_graft_file = git_pathdup("info/grafts"); if (DYNAMIC_WINDOW_SIZE) { - struct rlimit *as = malloc(sizeof(struct rlimit)); - if ( (getrlimit(RLIMIT_AS, as) == 0) && ((int)(as->rlim_cur) > 0) ) - packed_git_window_size = (unsigned int)(as->rlim_cur * DYNAMIC_WINDOW_SIZE_PERCENTAGE); - free(as); + struct rlimit as; + if (getrlimit(RLIMIT_AS, &as) == 0 && (int)as.rlim_cur > 0) + packed_git_window_size = (unsigned int)(as.rlim_cur * DYNAMIC_WINDOW_SIZE_PERCENTAGE); } } diff --git a/git-compat-util.h b/git-compat-util.h index 9603ca6..dad2dc8 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -188,6 +188,8 @@ extern int git_munmap(void *start, size_t length); #else /* NO_MMAP */ #include +#include +#include /* This value must be multiple of (pagesize * 2) */ #define DEFAULT_PACKED_GIT_WINDOW_SIZE \ --