From: Nguyễn Thái Ngọc Duy Date: Wed, 09 Jul 2014 07:32:51 GMT Subject: [PATCH v6 06/32] setup_git_env: use git_pathdup instead of xmalloc + sprintf Message-ID: <1404891197-18067-7-git-send-email-pclouds@gmail.com> In-Reply-To: <1404891197-18067-1-git-send-email-pclouds@gmail.com> From: Jeff King This is shorter, harder to get wrong, and more clearly captures the intent. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy --- environment.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/environment.c b/environment.c index 4dac5e9..4de7b81 100644 --- a/environment.c +++ b/environment.c @@ -135,15 +135,11 @@ static void setup_git_env(void) gitfile = read_gitfile(git_dir); git_dir = xstrdup(gitfile ? gitfile : git_dir); git_object_dir = getenv(DB_ENVIRONMENT); - if (!git_object_dir) { - git_object_dir = xmalloc(strlen(git_dir) + 9); - sprintf(git_object_dir, "%s/objects", git_dir); - } + if (!git_object_dir) + git_object_dir = git_pathdup("objects"); git_index_file = getenv(INDEX_ENVIRONMENT); - if (!git_index_file) { - git_index_file = xmalloc(strlen(git_dir) + 7); - sprintf(git_index_file, "%s/index", git_dir); - } + if (!git_index_file) + git_index_file = git_pathdup("index"); git_graft_file = getenv(GRAFT_ENVIRONMENT); if (!git_graft_file) git_graft_file = git_pathdup("info/grafts"); -- 1.9.1.346.ga2b5940